rpms/lcms/devel .cvsignore, 1.6, 1.7 import.log, 1.1, 1.2 lcms.spec, 1.24, 1.25 sources, 1.6, 1.7 coverity-boundchecking-cmsio1.patch, 1.1, NONE lcms-1.16-python-lib64.patch, 1.1, NONE lcms-fix_s390_lcms_h.patch, 1.1, NONE

[Nicolas Chauvet]

Author: kwizart

Update of /cvs/pkgs/rpms/lcms/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8815/devel

Modified Files:
	.cvsignore import.log lcms.spec sources 
Removed Files:
	coverity-boundchecking-cmsio1.patch 
	lcms-1.16-python-lib64.patch lcms-fix_s390_lcms_h.patch 
Log Message:
Update to 1.18 (final)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lcms/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	20 Mar 2009 17:35:45 -0000	1.6
+++ .cvsignore	23 Mar 2009 09:41:09 -0000	1.7
@@ -1 +1 @@
-lcms-1.18beta2.tar.gz
+lcms-1.18.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/lcms/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	20 Mar 2009 17:35:46 -0000	1.1
+++ import.log	23 Mar 2009 09:41:10 -0000	1.2
@@ -1 +1,2 @@
 lcms-1_18-0_1_beta2_fc10:HEAD:lcms-1.18-0.1.beta2.fc10.src.rpm:1237570439
+lcms-1_18-1_fc10:HEAD:lcms-1.18-1.fc10.src.rpm:1237801277


Index: lcms.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lcms/devel/lcms.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- lcms.spec	20 Mar 2009 17:35:46 -0000	1.24
+++ lcms.spec	23 Mar 2009 09:41:10 -0000	1.25
@@ -2,16 +2,13 @@
 
 Name:           lcms
 Version:        1.18
-Release:        0.1.beta2%{?dist}
+Release:        1%{?dist}
 Summary:        Color Management System
 
 Group:          Applications/Productivity
 License:        MIT
 URL:            http://www.littlecms.com/
-Source0:        http://www.littlecms.com/lcms-%{version}beta2.tar.gz
-Patch1:         lcms-1.16-python-lib64.patch
-Patch2:         coverity-boundchecking-cmsio1.patch
-Patch3:         lcms-fix_s390_lcms_h.patch
+Source0:        http://www.littlecms.com/lcms-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libjpeg-devel
@@ -20,7 +17,7 @@
 BuildRequires:  python-devel
 BuildRequires:  swig >= 1.3.12
 BuildRequires:  zlib-devel
-BuildRequires:  automake, autoconf, libtool
+
 
 Provides:       littlecms = %{version}-%{release}
 Requires:       %{name}-libs = %{version}-%{release}
@@ -61,10 +58,9 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b .python-lib64
-%patch2 -p2 -b .type4
-%patch3 -p1 -b .s390
+
 find . -name \*.[ch] | xargs chmod -x
+chmod 0644 AUTHORS COPYING ChangeLog NEWS README.1ST doc/TUTORIAL.TXT doc/LCMSAPI.TXT
 
 # Convert not UTF-8 files
 pushd doc
@@ -79,16 +75,20 @@
 
 
 %build
-autoreconf -i
 %configure --with-python --disable-static
+
+# remove rpath from libtool
+sed -i.rpath 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i.rpath 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+
 (cd python; ./swig_lcms)
+
 make %{?_smp_mflags}
 
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
 make install DESTDIR=${RPM_BUILD_ROOT} INSTALL="install -p"
-chmod 0644 AUTHORS COPYING ChangeLog NEWS README.1ST doc/TUTORIAL.TXT doc/LCMSAPI.TXT
 find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
 
 
@@ -126,6 +126,11 @@
 
 
 %changelog
+* Mon Mar 23 2009 kwizart < kwizart at gmail.com > - 1.18-1
+- Update to 1.18 (final)
+- Remove upstreamed patches
+- Disable autoreconf - patch libtool to prevent rpath issue
+
 * Fri Mar 20 2009 kwizart < kwizart at gmail.com > - 1.18-0.1.beta2
 - Update to 1.18beta2
  fix bug #487508: CVE-2009-0723 LittleCms integer overflow


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lcms/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	20 Mar 2009 17:35:46 -0000	1.6
+++ sources	23 Mar 2009 09:41:10 -0000	1.7
@@ -1 +1 @@
-b2962f8820cb081e31e863382131f40a  lcms-1.18beta2.tar.gz
+9f908e2dc48f76db77ac35a382e394c7  lcms-1.18.tar.gz


--- coverity-boundchecking-cmsio1.patch DELETED ---


--- lcms-1.16-python-lib64.patch DELETED ---


--- lcms-fix_s390_lcms_h.patch DELETED ---