[libnet] Move from lib to libdir.

Jon Ciesla limb at fedoraproject.org
Mon Apr 2 14:54:47 UTC 2012


commit cedcf228df916816f346f46046c812799125095f
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Mon Apr 2 09:54:37 2012 -0500

    Move from lib to libdir.

 libnet.spec |   19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 deletions(-)
---
diff --git a/libnet.spec b/libnet.spec
index e2468d6..cf8ff5c 100644
--- a/libnet.spec
+++ b/libnet.spec
@@ -1,7 +1,7 @@
 Summary:	C library for portable packet creation and injection
 Name:		libnet
 Version:	1.1.6
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	BSD
 Group:		System Environment/Libraries
 URL:		http://www.sourceforge.net/projects/libnet-dev/
@@ -36,18 +36,18 @@ mkdir __dist_sample
 cp -a sample __dist_sample
 
 %build
-%configure --libdir=/%{_lib}
+%configure --libdir=/%{_libdir}
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' install
 
-# Move %{name}.so to %{_libdir}, remove static .a and libtool .la files
-rm -f $RPM_BUILD_ROOT/%{_lib}/%{name}.{a,la,so}
-pushd $RPM_BUILD_ROOT/%{_lib}
-mkdir -p $RPM_BUILD_ROOT%{_libdir}
-ln -sf ../../%{_lib}/$(ls %{name}.so.?.?.?) $RPM_BUILD_ROOT%{_libdir}/%{name}.so
+# Move %%{name}.so to %%{_libdir}, remove static .a and libtool .la files
+rm -f $RPM_BUILD_ROOT/%{_libdir}/%{name}.{a,la,so}
+pushd $RPM_BUILD_ROOT/%{_libdir}
+#mkdir -p $RPM_BUILD_ROOT%%{_libdir}
+ln -sf ../../%{_libdir}/$(ls %{name}.so.?.?.?) $RPM_BUILD_ROOT%{_libdir}/%{name}.so
 popd
 
 # Prepare samples directory and perform some fixes
@@ -71,7 +71,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc README doc/CHANGELOG doc/CONTRIB doc/COPYING
-/%{_lib}/%{name}.so.*
+/%{_libdir}/%{name}.so.*
 
 %files devel
 %defattr(-,root,root,-)
@@ -84,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/%{name}*.3*
 
 %changelog
+* Mon Apr 02 2012 Jon Ciesla <limburgher at gmail.com> - 1.1.6-2
+- Move from lib to libdir.
+
 * Fri Mar 30 2012 Jon Ciesla <limburgher at gmail.com> - 1.1.6-1
 - Upgrade to 1.1.6, BZ 808394.
 


More information about the scm-commits mailing list