- updated to 1.3.6

- added link patch

Changed files:
    argyllcms-link.patch -> 1.1
    argyllcms.spec -> 1.5

diff --git a/argyllcms-link.patch b/argyllcms-link.patch
new file mode 100644 (file)
index 0000000..9e7781f
--- /dev/null
+++ b/argyllcms-link.patch
@@ -0,0 +1,26 @@
+--- hargyllcms-1.3.6/lib/Makefile.am.orig      2012-03-19 11:24:38.000000000 +0100
++++ hargyllcms-1.3.6/lib/Makefile.am   2012-03-23 18:07:29.525112808 +0100
+@@ -67,6 +67,7 @@
+ 
+ libargyll_la_LIBADD =                                         \
+       ../libusb/libargyllusb.la                               \
++      ../icc/libargyllicc.la                          \
+       $(TIFF_LIBS)                                            \
+       $(X_LIBS)                                               \
+       $(NULL)
+--- hargyllcms-1.3.6/Makefile.am.orig  2012-02-07 13:54:47.000000000 +0100
++++ hargyllcms-1.3.6/Makefile.am       2012-03-23 19:01:07.358553887 +0100
+@@ -2,12 +2,12 @@
+ 
+ SUBDIRS =                                             \
+       libusb                                          \
++      icc                                             \
+       lib                                             \
+       cgats                                           \
+       doc                                             \
+       gamut                                           \
+       h                                               \
+-      icc                                             \
+       link                                            \
+       jcnf                                            \
+       numlib                                          \

diff --git a/argyllcms.spec b/argyllcms.spec
index ce1b9c2b620f94f3a390dc05d64669487f9177ff..22e629e4f0d80aa574e95601c206db7bc0b284e1 100644 (file)
--- a/argyllcms.spec
+++ b/argyllcms.spec
@@ -1,12 +1,13 @@
 Summary:       ICC compatible color management system
 Summary(pl.UTF-8):     System zarządzania kolorami kompatybilny z ICC
 Name:          argyllcms
-Version:       1.3.5
+Version:       1.3.6
 Release:       1
-License:       AGPL v3, MIT, GPL v2+, LGPL v2.1+, GNU FDL 1.3
+License:       AGPL v3, MIT, GPL v2+, LGPL v2.1+, FDL v1.3
 Group:         X11/Applications/Graphics
 Source0:       http://people.freedesktop.org/~hughsient/releases/h%{name}-%{version}.tar.xz
-# Source0-md5: e1c51b73cfbf309099340c73b5c4ad10
+# Source0-md5: a7d270585c822c98bc00eae5bdf2e04e
+Patch0:                %{name}-link.patch
 URL:           http://www.argyllcms.com/
 BuildRequires: libtiff-devel
 BuildRequires: libusb-devel >= 1.0.0
@@ -94,9 +95,11 @@ Argyll.
 
 %prep
 %setup -q -n h%{name}-%{version}
+%patch0 -p1
 
 %build
-%configure
+%configure \
+       --disable-static
 %{__make}
 
 %install
@@ -107,18 +110,26 @@ rm -rf $RPM_BUILD_ROOT
 # they shouldn't put Makefile.am to ref_DATA
 %{__rm} $RPM_BUILD_ROOT%{_datadir}/color/argyll/ref/Makefile.am
 
+# no -devel package (headers not exported)
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/lib*.{so,la}
+
+# packaged as %doc
 %{__rm} -r $RPM_BUILD_ROOT%{_docdir}/argyll
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post  -p /sbin/ldconfig
+%postun        -p /sbin/ldconfig
+
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS Readme.txt log.txt ttbd.txt
+%doc AUTHORS Readme.txt
 %attr(755,root,root) %{_bindir}/applycal
 %attr(755,root,root) %{_bindir}/average
 %attr(755,root,root) %{_bindir}/cb2ti3
 %attr(755,root,root) %{_bindir}/ccttest
+%attr(755,root,root) %{_bindir}/ccxxmake
 %attr(755,root,root) %{_bindir}/chartread
 %attr(755,root,root) %{_bindir}/collink
 %attr(755,root,root) %{_bindir}/colprof
@@ -160,6 +171,12 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/verify
 %attr(755,root,root) %{_bindir}/viewgam
 %attr(755,root,root) %{_bindir}/xicclu
+%attr(755,root,root) %{_libdir}/libargyll.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libargyll.so.0
+%attr(755,root,root) %{_libdir}/libargyllicc.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libargyllicc.so.0
+%attr(755,root,root) %{_libdir}/libargyllusb.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libargyllusb.so.0
 %dir %{_datadir}/color/argyll
 %{_datadir}/color/argyll/ref