[coccinelle] Confirmed with upstream that *.so files are no longer required. Re-enable move of python libs to pyt

Richard W.M. Jones rjones at fedoraproject.org
Mon Jul 30 16:00:59 UTC 2012


commit e4cbe88fb74bc2c2071eaa02a5c7e2b4c3cddc40
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Mon Jul 30 17:00:25 2012 +0100

    Confirmed with upstream that *.so files are no longer required.
    Re-enable move of python libs to python library dir.

 coccinelle.spec |   17 +++++------------
 1 files changed, 5 insertions(+), 12 deletions(-)
---
diff --git a/coccinelle.spec b/coccinelle.spec
index 67a2bcd..1b2a89e 100644
--- a/coccinelle.spec
+++ b/coccinelle.spec
@@ -8,7 +8,7 @@
 
 Name:           coccinelle
 Version:        1.0.0
-Release:        0.rc14.2%{?dist}
+Release:        0.rc14.3%{?dist}
 Summary:        Semantic patching for Linux (spatch)
 
 Group:          Development/Libraries
@@ -117,20 +117,12 @@ echo '-b %{_bindir}/spatch' \
   > $RPM_BUILD_ROOT/etc/prelink.conf.d/%{name}.conf
 %endif
 
-%if 0
-strip $RPM_BUILD_ROOT%{_libdir}/*.so
-chrpath --delete $RPM_BUILD_ROOT%{_libdir}/*.so
-
-# Remove bogus Makefiles from Python directory.
-find $RPM_BUILD_ROOT%{_datadir}/%{name} -name Makefile -delete
-
 # Move Python libraries to python lib directory.
 mkdir -p $RPM_BUILD_ROOT%{python_sitelib}
 mv $RPM_BUILD_ROOT%{_datadir}/%{name}/python/coccilib \
   $RPM_BUILD_ROOT%{python_sitelib}
 
 rmdir $RPM_BUILD_ROOT%{_datadir}/%{name}/python
-%endif
 
 # Remove bytecode binary.
 rm $RPM_BUILD_ROOT%{_bindir}/spatch.byte
@@ -157,10 +149,7 @@ $RPM_BUILD_ROOT%{_bindir}/spatch -sp_file demos/simple.cocci demos/simple.c
 %{_datadir}/%{name}/
 %{_mandir}/man1/*.1*
 %{_mandir}/man3/*.3*
-%if 0
 %{python_sitelib}/coccilib/
-%{_libdir}/*.so
-%endif
 %if !%opt
 %config(noreplace) /etc/prelink.conf.d/%{name}.conf
 %endif
@@ -175,6 +164,10 @@ $RPM_BUILD_ROOT%{_bindir}/spatch -sp_file demos/simple.cocci demos/simple.c
 
 
 %changelog
+* Mon Jul 30 2012 Richard W.M. Jones <rjones at redhat.com> - 1.0.0-0.rc14.3
+- Confirmed with upstream that *.so files are no longer required.
+- Re-enable move of python libs to python library dir.
+
 * Mon Jul 30 2012 Richard W.M. Jones <rjones at redhat.com> - 1.0.0-0.rc14.2
 - New upstream version 1.0.0-rc14.
 - +BR ocaml-camlp4-devel


More information about the scm-commits mailing list