- don't add '64' to libdir in 64-bit arch, it already has one

Changed files:
    popt-libdir64.patch -> 1.1
    popt.spec -> 1.65

diff --git a/popt-libdir64.patch b/popt-libdir64.patch
new file mode 100644 (file)
index 0000000..e3ecba2
--- /dev/null
+++ b/popt-libdir64.patch
@@ -0,0 +1,12 @@
+diff -durN popt-1.9.orig/Makefile.am popt-1.9/Makefile.am
+--- popt-1.9.orig/Makefile.am  2004-12-18 21:43:30.632504464 +0100
++++ popt-1.9/Makefile.am       2004-12-18 21:44:41.187778432 +0100
+@@ -35,7 +35,7 @@
+ 
+ include_HEADERS = popt.h
+ 
+-usrlibdir = $(libdir)@MARK64@
++usrlibdir = $(libdir)
+ usrlib_LTLIBRARIES = libpopt.la
+ libpopt_la_SOURCES = popt.c findme.c poptparse.c poptconfig.c popthelp.c
+ 

diff --git a/popt.spec b/popt.spec
index 737db4a0a45120312c04fca060a0c09e50f71ce6..14fb7e61415594d7d572218be5e76b8b33c69c55 100644 (file)
--- a/popt.spec
+++ b/popt.spec
@@ -18,6 +18,7 @@ Patch0:               %{name}-values.patch
 Patch1:                %{name}-gettext0.11.patch
 Patch2:                %{name}-pl.po.patch
 Patch3:                %{name}-zh_CN.patch
+Patch4:                %{name}-libdir64.patch
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake
 BuildRequires: gettext-devel >= 0.11.5
@@ -142,6 +143,7 @@ Biblioteka statyczna popt.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 mv -f po/zh_CN{.GB2312,}.po
 
@@ -165,14 +167,14 @@ autoupdate
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/lib
+install -d $RPM_BUILD_ROOT/%{_lib}
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-mv -f $RPM_BUILD_ROOT%{_libdir}/lib*.so.*.* $RPM_BUILD_ROOT/lib
+mv -f $RPM_BUILD_ROOT%{_libdir}/lib*.so.*.* $RPM_BUILD_ROOT/%{_lib}
 rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.so
-ln -sf /lib/`(cd $RPM_BUILD_ROOT/lib; echo *)` \
+ln -sf /%{_lib}/`(cd $RPM_BUILD_ROOT/%{_lib}; echo *)` \
        $RPM_BUILD_ROOT%{_libdir}/libpopt.so
 
 %find_lang %{name}
@@ -185,7 +187,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%attr(755,root,root) /lib/*
+%attr(755,root,root) /%{_lib}/*
 
 %files devel
 %defattr(644,root,root,755)