[argyllcms] Ship a shared library to reduce the installed package size from

Richard Hughes rhughes at fedoraproject.org
Tue Feb 7 13:14:16 UTC 2012


commit 31b4494f821258478ee35f20e96db7caf1ec2581
Author: Richard Hughes <richard at hughsie.com>
Date:   Tue Feb 7 13:11:46 2012 +0000

    Ship a shared library to reduce the installed package size from
    
      27.7Mb to 3.2Mb by removing 46 instances of static linking.

 ...dd-an-experimental-ColorHug-sensor-driver.patch |    8 +++---
 argyllcms.spec                                     |   21 +++++++++++++++----
 sources                                            |    2 +-
 3 files changed, 21 insertions(+), 10 deletions(-)
---
diff --git a/0001-Add-an-experimental-ColorHug-sensor-driver.patch b/0001-Add-an-experimental-ColorHug-sensor-driver.patch
index 38a7990..9d42680 100644
--- a/0001-Add-an-experimental-ColorHug-sensor-driver.patch
+++ b/0001-Add-an-experimental-ColorHug-sensor-driver.patch
@@ -936,14 +936,14 @@ index 6155cf0..15c6545 100644
  } instType;
  
 diff --git a/lib/Makefile.am b/lib/Makefile.am
-index ad5fcdc..d393228 100644
+index 95c110f..52b60e1 100644
 --- a/lib/Makefile.am
 +++ b/lib/Makefile.am
-@@ -42,6 +42,7 @@ libargyll_a_SOURCES += ../spectro/inst.h ../spectro/inst.c ../spectro/insttypes.
+@@ -41,6 +41,7 @@ libargyll_la_SOURCES += ../spectro/inst.h ../spectro/inst.c ../spectro/dtp20.c .
  	../spectro/i1disp.c ../spectro/i1disp.h ../spectro/i1pro.c ../spectro/i1pro.h ../spectro/i1pro_imp.c ../spectro/i1pro_imp.h	\
  	../spectro/munki.c ../spectro/munki_imp.c ../spectro/ss.c ../spectro/ss.h ../spectro/ss_imp.c ../spectro/ss_imp.h ../spectro/hcfr.c ../spectro/hcfr.h	\
  	../spectro/spyd2.c ../spectro/spyd2.h ../spectro/spyd2setup.h ../spectro/spyd2PLD.h ../spectro/huey.c ../spectro/huey.h ../spectro/unixio.c	\
-+	../spectro/colorhug.c ../spectro/colorhug.c	\
- 	../spectro/usbio.c ../spectro/hidio.c ../spectro/pollem.c ../spectro/pollem.h ../spectro/icoms.h ../spectro/conv.h ../spectro/usbio.h	\
++	../spectro/colorhug.c ../spectro/colorhug.h	\
+ 	../spectro/usbio.c ../spectro/hidio.c ../spectro/pollem.h ../spectro/icoms.h ../spectro/conv.h ../spectro/usbio.h	\
  	../spectro/hidio.h ../spectro/munki.h ../spectro/munki_imp.h
  
diff --git a/argyllcms.spec b/argyllcms.spec
index abb0ee6..e6439ba 100644
--- a/argyllcms.spec
+++ b/argyllcms.spec
@@ -1,6 +1,6 @@
 Name:    argyllcms
 Version: 1.3.5
-Release: 6%{?dist}
+Release: 7%{?dist}
 Summary: ICC compatible color management system
 Group:   User Interface/X
 License: GPLv3 and MIT
@@ -62,15 +62,16 @@ libtoolize --force
 ./legal.sh
 
 %build
-%configure
+%configure --disable-static
 make
 
 %install
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 
-%clean
-rm -rf %{buildroot}
+# We don't want other programs to use these
+rm -f $RPM_BUILD_ROOT%{_libdir}/libargyll*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/libargyll*.so
 
 %files
 %defattr(0644,root,root,0755)
@@ -78,15 +79,25 @@ rm -rf %{buildroot}
 
 %attr(0755,root,root) %{_bindir}/*
 %{_datadir}/color/argyll
+%{_datadir}/color/argyll/ref
 /lib/udev/rules.d/55-Argyll.rules
+%{_libdir}/libargyll*.so.*
 
 %exclude %{_datadir}/doc
 
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
 %files doc
 %defattr(0644,root,root,0755)
-%doc doc/*.html doc/*.jpg doc/*.txt
+%doc doc/*.html doc/*.jpg
 
 %changelog
+* Tue Feb 07 2012 Richard Hughes <rhughes at redhat.com> - 1.3.5-7
+- Ship a shared library to reduce the installed package size from
+  27.7Mb to 3.2Mb by removing 46 instances of static linking.
+
 * Thu Jan 26 2012 Richard Hughes <rhughes at redhat.com> - 1.3.5-6
 - Fix the ColorHug patch to not time out with firmware >= 1.1.1 and to
   correctly report negative numbers.
diff --git a/sources b/sources
index 0f27b5f..8c370be 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-081263357bb0445bd603712a739bfa6b  hargyllcms-1.3.5.tar.xz
+0087c5b68ab10c962a63b4f262854ef5  hargyllcms-1.3.5.tar.xz


More information about the scm-commits mailing list