--- /dev/null
+diff -urNp popt-1.16.orig/Makefile.am popt-1.16/Makefile.am
+--- popt-1.16.orig/Makefile.am 2012-11-02 18:45:02.000000000 +0900
++++ popt-1.16/Makefile.am 2014-06-18 21:47:58.052719970 +0900
+@@ -47,7 +47,7 @@ usrlib_LTLIBRARIES = libpopt.la
+ libpopt_la_SOURCES = popt.c poptparse.c poptconfig.c popthelp.c poptint.c
+ libpopt_la_LDFLAGS = -no-undefined @LTLIBINTL@ @LTLIBICONV@
+
+-pkgconfigdir = $(prefix)/lib/pkgconfig
++pkgconfigdir = $(prefix)/lib64/pkgconfig
+ pkgconfig_DATA = popt.pc
+
+ if HAVE_LD_VERSION_SCRIPT
+diff -urNp popt-1.16.orig/Makefile.in popt-1.16/Makefile.in
+--- popt-1.16.orig/Makefile.in 2012-11-02 18:45:02.000000000 +0900
++++ popt-1.16/Makefile.in 2014-06-18 21:48:29.420719373 +0900
+@@ -370,7 +370,7 @@ usrlib_LTLIBRARIES = libpopt.la
+ libpopt_la_SOURCES = popt.c poptparse.c poptconfig.c popthelp.c poptint.c
+ libpopt_la_LDFLAGS = -no-undefined @LTLIBINTL@ @LTLIBICONV@ \
+ $(am__append_1)
+-pkgconfigdir = $(prefix)/lib/pkgconfig
++pkgconfigdir = $(prefix)/lib64/pkgconfig
+ pkgconfig_DATA = popt.pc
+ man_MANS = popt.3
+ BUILT_SOURCES = popt.pc # popt.lcd
Name: popt
Summary: C library for parsing command line parameters
Version: 1.16
-Release: 1
+Release: 3
Group: System/Libraries
License: MIT
URL: http://www.rpm5.org/
Source0: http://www.rpm5.org/files/%{name}/%{name}-%{version}.tar.gz
+Source1001: %{name}.manifest
+Patch1: popt-pkgconfig-lib64.patch
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
%prep
%setup -q -n %{name}-%{version}
+%ifarch x86_64
+%patch1 -p1
+%endif
%build
-
+cp %{SOURCE1001} .
%configure --disable-static \
--libdir=/%{_lib} \
--disable-nls
# Multiple popt configurations are possible
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/popt.d
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/license
+for keyword in LICENSE COPYING COPYRIGHT;
+do
+ for file in `find %{_builddir} -name $keyword`;
+ do
+ cat $file >> $RPM_BUILD_ROOT%{_datadir}/license/%{name};
+ echo "";
+ done;
+done
%post -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
+%manifest %{name}.manifest
%doc COPYING
+%{_datadir}/license/%{name}
%{_sysconfdir}/popt.d
/%{_lib}/libpopt.so.*