rpms/argyllcms/devel .cvsignore, 1.7, 1.8 argyllcms.spec, 1.16, 1.17 sources, 1.7, 1.8
Richard Hughes
rhughes at fedoraproject.org
Mon Feb 1 17:48:43 UTC 2010
Author: rhughes
Update of /cvs/pkgs/rpms/argyllcms/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5520
Modified Files:
.cvsignore argyllcms.spec sources
Log Message:
* Mon Feb 01 2010 Richard Hughes <rhughes at redhat.com> - 1.1.0-0.1-20100201git
- Update to 1.1.0
- Switch to using the hargyllcms friendly fork sources as upstream refuses
to switch away from jam, or stop bundling other projects (yajl) and
libraries (libusb, libtiff).
- Switch primarily motivated by the fragility of the automake patch, and that
the original patch will not cleanly apply to the new sources without
essentially rewriting it. The old patch also compiles a few of the source
object files 3 or 4 times and links different versions internally with
different binaries.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/argyllcms/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore 1 Jul 2009 13:14:11 -0000 1.7
+++ .cvsignore 1 Feb 2010 17:48:43 -0000 1.8
@@ -1,2 +1 @@
-Argyll_V1.0.1_autotools.patch.gz
-Argyll_V1.0.4_src.zip
+hargyllcms-1.1.0-20100201.tar.gz
Index: argyllcms.spec
===================================================================
RCS file: /cvs/pkgs/rpms/argyllcms/devel/argyllcms.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- argyllcms.spec 1 Feb 2010 09:07:10 -0000 1.16
+++ argyllcms.spec 1 Feb 2010 17:48:43 -0000 1.17
@@ -1,40 +1,28 @@
-#define alphaversion Beta8
-#define alphatag .%{alphaversion}
-
-%define archivename Argyll_V%{version}%{?alphaversion}_src.zip
+%define alphatag 20100201
Name: argyllcms
-Version: 1.0.4
-Release: 5%{?alphatag}%{?dist}
-Summary: ICC compatible color management system
+Version: 1.1.0
+Release: 0.1.%{?alphatag}git%{?dist}
+Summary: ICC compatible color management system
Group: User Interface/X
License: GPLv3 and MIT
-URL: http://www.%{name}.com/
+URL: http://github.com/hughsie/hargyllcms
-Source0: %{url}%{archivename}
-# Many thanks to Alastair M. Robinson!
-Patch1: http://www.blackfiveservices.co.uk/Argyll_V1.0.1_autotools.patch.gz
-Patch2: %{name}-1.0.3-remove-libusb-fork-check.patch
-# Patch applied for legal reasons
-Patch4: %{name}-1.0.2-legal.patch
-#Patch5: argyllcms-CVE-2009-0583,0584.patch
-#Patch6: argyllcms-CVE-2009-0792.patch
-#Patch7: argyllcms-1.0.3-autotools.patch
-Patch8: argyllcms-1.0.4-dispwin-randr-fix.patch
-Patch9: argyllcms-1.0.4-remove-mode-666-ttys-and-use-acl-manage.patch
+#Source0: http://people.freedesktop.org/~hughsient/releases/hargyllcms-%{version}-%{?alphatag}.tar.gz
+Source0: http://people.freedesktop.org/~hughsient/releases/hargyllcms-%{version}-%{?alphatag}.tar.gz
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: libtiff-devel, libusb-devel
BuildRequires: libX11-devel, libXext-devel, libXxf86vm-devel, libXinerama-devel
BuildRequires: libXScrnSaver-devel, libXrandr-devel
-Requires: udev, PolicyKit
+Requires: udev
%description
The Argyll color management system supports accurate ICC profile creation for
-scanners, CMYK printers, film recorders and calibration and profiling of
-displays.
+acquisition devices, CMYK printers, film recorders and calibration and profiling
+of displays.
Spectral sample data is supported, allowing a selection of illuminants observer
types, and paper fluorescent whitener additive compensation. Profiles can also
@@ -46,7 +34,6 @@ engine available anywhere, as well as su
conversion. Device color gamuts can also be viewed and compared using a VRML
viewer.
-
%package doc
Summary: Argyll CMS documentation
Group: User Interface/X
@@ -55,77 +42,35 @@ Requires: %{name} = %{version}-%{release
%description doc
The Argyll color management system supports accurate ICC profile creation for
-scanners, CMYK printers, film recorders and calibration and profiling of
-displays.
+acquisition devices, CMYK printers, film recorders and calibration and profiling
+of displays.
This package contains the Argyll color management system documentation.
-
%prep
-%setup -q -n Argyll_V%{version}
-# Autotools support
-%patch1 -p1 -b .auto
-# Use the system libusb. If there is a ***REPORTED*** problem the distro will fix it
-%patch2 -p1 -b .sysusb
-# Legal patch required
-%patch4 -p1 -b .legal
-#%patch5 -p0
-#%patch6 -p0
-#%patch7 -p0
-%patch8 -p1 -b .randr
-%patch9 -p1 -b .remove-ttys-and-use-acls
-
-# Salvage policy files
-mv libusb/19-color.fdi .
-mv libusb/color-device-file.policy .
-mv libusb/55-Argyll.rules .
-
-# Remove useless bundled libs to make sure we don't accidentally include them
-rm -fr tiff libusb libusbw
-
-chmod u+x configure
+#%setup -q -n hargyllcms-%{version}
+%setup -q -n hargyllcms-%{?version}-%{?alphatag}
+# we're not allowed to refer to acquisition devices as scanners
+./legal.sh
%build
%configure
make
-#%check
-#make check
-
%install
rm -rf %{buildroot}
-
make install DESTDIR=%{buildroot}
-# Do some device permission magic
-install -d -m 0755 %{buildroot}%{_datadir}/hal/fdi/policy/10osvendor/
-install -p -m 0644 19-color.fdi \
- %{buildroot}%{_datadir}/hal/fdi/policy/10osvendor/
-
-install -d -m 0755 %{buildroot}%{_datadir}/PolicyKit/policy/
-install -p -m 0644 color-device-file.policy \
- %{buildroot}%{_datadir}/PolicyKit/policy/
-
-install -d -m 0755 %{buildroot}%{_datadir}/PolicyKit/policy/
-install -p -m 0644 color-device-file.policy \
- %{buildroot}%{_datadir}/PolicyKit/policy/
-
-install -d -m 0755 %{buildroot}/lib/udev/rules.d/
-install -p -m 0644 55-Argyll.rules \
- %{buildroot}/lib/udev/rules.d/
-
%clean
rm -rf %{buildroot}
-
%files
%defattr(0644,root,root,0755)
%doc *.txt
%attr(0755,root,root) %{_bindir}/*
%{_datadir}/color/argyll
-%{_datadir}/hal/fdi/policy/10osvendor/19-color.fdi
-%{_datadir}/PolicyKit/policy/color-device-file.policy
+%{_datadir}/color/argyll/ref
/lib/udev/rules.d/55-Argyll.rules
%exclude %{_datadir}/doc
@@ -134,8 +79,18 @@ rm -rf %{buildroot}
%defattr(0644,root,root,0755)
%doc doc/*.html doc/*.jpg doc/*.txt
-
%changelog
+* Mon Feb 01 2010 Richard Hughes <rhughes at redhat.com> - 1.1.0-0.1-20100201git
+- Update to 1.1.0
+- Switch to using the hargyllcms friendly fork sources as upstream refuses
+ to switch away from jam, or stop bundling other projects (yajl) and
+ libraries (libusb, libtiff).
+- Switch primarily motivated by the fragility of the automake patch, and that
+ the original patch will not cleanly apply to the new sources without
+ essentially rewriting it. The old patch also compiles a few of the source
+ object files 3 or 4 times and links different versions internally with
+ different binaries.
+
* Mon Feb 01 2010 Richard Hughes <rhughes at redhat.com> - 1.0.4-5
- Backport the 55-Argyll.rules files from hargyllcms as the upstream Argyll file
is insecure.
@@ -171,57 +126,58 @@ rm -rf %{buildroot}
* Wed Sep 3 2008 Nicolas Mailhot <nicolas.mailhot at laposte.net>
- 1.0.3-1
-⌨ Bugfix release
+- Bugfix release
* Mon Sep 1 2008 Nicolas Mailhot <nicolas.mailhot at laposte.net>
- 1.0.2-1
-ᾢ Bugfix release
+- Bugfix release
* Sun Jul 27 2008 Nicolas Mailhot <nicolas.mailhot at laposte.net>
- 1.0.1-1
-☻ Lots of workarounds dropped — Argyll continues progressing towards “normal
+- Lots of workarounds dropped — Argyll continues progressing towards “normal
package” state
-☺ No more jam hell ☡, autotooling patch by Alastair M. Robinson ♥♥♥
-♿ New workaround added for private libusb check ⚔ We build againt system
- libusb, and will fix ⚕ any problem people care to report
-⁜ Re-applied some patches still not merged upstream, including the legal ⚖ one
-⚙ It builds, what can go wrong⁉
-⁂ Changed Huey policy file. Huey users, please test
+- No more jam hell, autotooling patch by Alastair M. Robinson
+- New workaround added for private libusb check ⚔ We build againt system
+ libusb, and will fix any problem people care to report
+- Re-applied some patches still not merged upstream, including the legal - one
+- It builds, what can go wrong
+- Changed Huey policy file. Huey users, please test
* Wed Mar 26 2008 Tom "spot" Callaway <tcallawa at redhat.com>
- patch applied for legal reasons
* Thu Feb 8 2008 Nicolas Mailhot <nicolas.mailhot at laposte.net>
- 0.70-0.8.Beta9
-✓ Another code fix (Stefan Brüns)
+- Another code fix (Stefan Brüns)
- 0.70-0.8.Beta8
-✓ update to Stefan Brüns' latest safe-printf patch (bz421921#c18)
+- update to Stefan Brüns' latest safe-printf patch (bz421921#c18)
* Thu Feb 7 2008 Nicolas Mailhot <nicolas.mailhot at laposte.net>
- 0.70-0.7.Beta8
Finally got around packaging beta8, I suck
-✓ Fedora patches merged upstream, dropped from rpm
-✓ Huey handling seems sanitized (needs testing by Huey users)
-⚖ Upstream relicensed icc and cgats library to plain MIT license (Thanks!)
+- Fedora patches merged upstream, dropped from rpm
+- Huey handling seems sanitized (needs testing by Huey users)
+- Upstream relicensed icc and cgats library to plain MIT license (Thanks!)
* Thu Dec 14 2007 Nicolas Mailhot <nicolas.mailhot at laposte.net>
- 0.70-0.6.Beta7
-☹ fix udev typo
+- fix udev typo
- 0.70-0.5.Beta7
-⚖ Remove files that may be GPLv2-only according to upstream
+- Remove files that may be GPLv2-only according to upstream
* Thu Dec 13 2007 Nicolas Mailhot <nicolas.mailhot at laposte.net>
- 0.70-0.4.Beta7
-✓ move to modern PolicyKit world (David Zeuthen, Frédéric Crozat, me)
+- move to modern PolicyKit world (David Zeuthen, Frédéric Crozat, me)
* Wed Dec 12 2007 Nicolas Mailhot <nicolas.mailhot at laposte.net>
- 0.70-0.3.Beta7
-✓ integrate review feedback
+- integrate review feedback
- 0.70-0.2.Beta7
-✓ fix buffer overflows in dispread and iccdump (credits Daniel Berrangé)
+- fix buffer overflows in dispread and iccdump (credits Daniel Berrangé)
- 0.70-0.1.Beta7
-✓ 0.70 beta7
-➤ initial laborious packaging
-✌ Build system from hell untangling by Frédéric Crozat (Mandriva), and me
-✌ device permission magic by me
-☣ Massively under-tested package, please report problems
+- 0.70 beta7
+- initial laborious packaging
+- Build system from hell untangling by Frédéric Crozat (Mandriva), and me
+- device permission magic by me
+- Massively under-tested package, please report problems
+
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/argyllcms/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources 1 Jul 2009 13:14:11 -0000 1.7
+++ sources 1 Feb 2010 17:48:43 -0000 1.8
@@ -1,2 +1 @@
-cdb94385421c2fae1cf6fb068069cd9e Argyll_V1.0.1_autotools.patch.gz
-de4010412da4f23a0df3de8f4d3d230d Argyll_V1.0.4_src.zip
+59cdfbefa1c905967b0848634c2fb509 hargyllcms-1.1.0-20100201.tar.gz
More information about the scm-commits
mailing list