Hello community,

here is the log from the commit of package argyllcms for openSUSE:Factory 
checked in at 2013-08-01 15:20:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/argyllcms (Old)
 and      /work/SRC/openSUSE:Factory/.argyllcms.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "argyllcms"

Changes:
--------
--- /work/SRC/openSUSE:Factory/argyllcms/argyllcms.changes      2012-10-26 
16:58:15.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.argyllcms.new/argyllcms.changes 2013-08-01 
15:20:18.000000000 +0200
@@ -1,0 +2,25 @@
+Wed Jul 31 17:13:06 UTC 2013 - [email protected]
+
+- Release 1.5.1:
+  + Many bug fixes
+  + add support for i1pro Rev E (i1pro2)
+  + improved support for ColorMunki and i1pro
+  + spotread can interactively query refresh rate
+  + spyd2en, spyd4en and i1d3ccss was been merged in one tool named
+    oeminst.
+  + No longer uses libusb, talk directly to USB device through
+    kernel devices.
+  + Add support for ColorCheckerPassport in scanin.
+  + -V (adaptative mode) is deprecated in dispcal, dispread and
+    ccxxmake, since it is the default. Use -ZA flag to disable.
+  + ColorHug support is enabled by default.
+  + Added automatic adjustement of patch reading for i1d3.
+- Drop argyllcms-fixbuild.patch (merged)
+- Rename argyllcms-1.3.0-udev151.patch to argyllcms-udev151.patch.
+- Add argyllcms-udev-builtin.patch for udev usb-db builtin
+  (openSUSE 12.2/12.3) and argyllcms-udev-hwdb.patch (openSUSE 13.1
+  and later) for udev hwdb.
+- Update argyllcms-1.4.0-warnings.patch (partially merged)
+- Drop SG_header.txt, merged upstream.
+
+-------------------------------------------------------------------

Old:
----
  Argyll_V1.4.0_src.zip
  SG_header.txt
  argyllcms-1.3.0-udev151.patch
  argyllcms-fixbuild.patch

New:
----
  Argyll_V1.5.1_src.zip
  argyllcms-udev-builtin.patch
  argyllcms-udev-hwdb.patch
  argyllcms-udev151.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ argyllcms.spec ++++++
--- /var/tmp/diff_new_pack.TjDMKd/_old  2013-08-01 15:20:19.000000000 +0200
+++ /var/tmp/diff_new_pack.TjDMKd/_new  2013-08-01 15:20:19.000000000 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package argyllcms
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -25,7 +25,7 @@
 %define archivename Argyll_V%{version}%{?alphaversion}_src.zip
 
 Name:           argyllcms
-Version:        1.4.0
+Version:        1.5.1
 Release:        0
 Summary:        ICC compatible color management system
 License:        AGPL-3.0 and GPL-2.0+ and MIT
@@ -37,13 +37,14 @@
 Source1:        19-color.fdi
 Source2:        color-device-file.policy
 Source3:        ajam-2.5.2-1.3.3.tgz
-Source4:        SG_header.txt
 # drop udev-acl stuff, handled by udev directly (Mandriva)
-Patch5:         argyllcms-1.3.0-udev151.patch
-# fix build (upstream)
-Patch6:         argyllcms-fixbuild.patch
+Patch5:         argyllcms-udev151.patch
 Patch7:         ajam-include.patch
 Patch8:         argyllcms-1.4.0-warnings.patch
+# PATCH-FIX-UPSTREAM argyllcms-udev-builtin.patch [email protected] -- usb-db 
is now builtin in udev
+Patch9:         argyllcms-udev-builtin.patch
+# PATCH-FIX-UPSTREAM argyllcms-udev-hwdb.patch [email protected] -- usb-db is 
replaced by hwdb in recent udev
+Patch10:        argyllcms-udev-hwdb.patch
 
 BuildRequires:  libjpeg-devel
 BuildRequires:  libtiff-devel
@@ -93,20 +94,23 @@
 %setup -q -n Argyll_V%{version}
 %if 0%{?suse_version} >= 1120
 %patch5 -p1 -b .udev151
+%if 0%{?suse_version} >= 1220
+%if 0%{?suse_version} >= 1310
+%patch10 -p1 -b .hwdb
+%else
+%patch9 -p1 -b .builtin
+%endif
+%endif
 %endif
-%patch6 -p1 -b .fixbuild
 %patch8 -p1 -b .warnings
 
-cp -f %{SOURCE4} doc
-
 tar xvf %{SOURCE3}
 cd ajam-2.5.2-1.3.3
 %patch7 -p1 -b .include
 cd ..
 
 # remove unused source code
-rm -fr libusb libusbw
-rm -fr 
libusb1/{*.inf,*.rtf,*.inf,*.cat,*.vcproj,*.sys,*.dsw,*.sln,*.dsp,*template*,WinCo*,winsub*,*kext*,KDRIVER_LICENSE,README_MSVC.txt,msvc,*.cmd}}
+rm -fr 
usb/{*.inf,*.rtf,*.inf,*.cat,*.vcproj,*.sys,*.dsw,*.sln,*.dsp,*template*,WinCo*,winsub*,*kext*,KDRIVER_LICENSE,README_MSVC.txt,msvc,*.cmd,bin,driver,binfiles.*}
 
 %build
 cd ajam-2.5.2-1.3.3
@@ -144,7 +148,7 @@
         %{buildroot}%{_datadir}/PolicyKit/policy/
 %else
 install -d -m 0755 %{buildroot}%{_udevrulesdir}
-install -p -m 0644 libusb1/55-Argyll.rules \
+install -p -m 0644 usb/55-Argyll.rules \
         %{buildroot}%{_udevrulesdir}
 %endif
 


++++++ argyllcms-1.4.0-warnings.patch ++++++
--- /var/tmp/diff_new_pack.TjDMKd/_old  2013-08-01 15:20:19.000000000 +0200
+++ /var/tmp/diff_new_pack.TjDMKd/_new  2013-08-01 15:20:19.000000000 +0200
@@ -10,14 +10,3 @@
                        }
  
                        else 
-diff -up Argyll_V1.4.0/jcnf/test.c.warning Argyll_V1.4.0/jcnf/test.c
---- Argyll_V1.4.0/jcnf/test.c.warning  2012-06-22 18:02:57.401148828 +0200
-+++ Argyll_V1.4.0/jcnf/test.c  2012-06-22 18:03:11.177723389 +0200
-@@ -144,6 +144,7 @@ main(int argc, char *argv[]) {
-       jco->del(jco);
- 
-       printf("We're done\n");
-+      return 0;
- }
- 
- void

++++++ argyllcms-udev-builtin.patch ++++++
Index: Argyll_V1.5.1/usb/55-Argyll.rules
===================================================================
--- Argyll_V1.5.1.orig/usb/55-Argyll.rules
+++ Argyll_V1.5.1/usb/55-Argyll.rules
@@ -77,7 +77,7 @@ ATTRS{idVendor}=="04d8", ATTRS{idProduct
 ATTRS{idVendor}=="273f", ATTRS{idProduct}=="1001", 
ENV{COLOR_MEASUREMENT_DEVICE}="1"
 
 
 # Set ID_VENDOR and ID_MODEL acording to VID and PID
-IMPORT{program}="usb-db %p"
+IMPORT{builtin}="usb-db"
 
 LABEL="argyll_rules_end"
++++++ argyllcms-udev-hwdb.patch ++++++
Index: Argyll_V1.5.1/usb/55-Argyll.rules
===================================================================
--- Argyll_V1.5.1.orig/usb/55-Argyll.rules
+++ Argyll_V1.5.1/usb/55-Argyll.rules
@@ -77,7 +77,7 @@ ATTRS{idVendor}=="04d8", ATTRS{idProduct
 ATTRS{idVendor}=="273f", ATTRS{idProduct}=="1001", 
ENV{COLOR_MEASUREMENT_DEVICE}="1"
 
 
 # Set ID_VENDOR and ID_MODEL acording to VID and PID
-IMPORT{program}="usb-db %p"
+IMPORT{builtin}="hwdb --subsystem=usb"
 
 LABEL="argyll_rules_end"
++++++ argyllcms-udev151.patch ++++++
Index: Argyll_V1.5.1/usb/55-Argyll.rules
===================================================================
--- Argyll_V1.5.1.orig/usb/55-Argyll.rules
+++ Argyll_V1.5.1/usb/55-Argyll.rules
@@ -77,14 +77,7 @@ ATTRS{idVendor}=="04d8", ATTRS{idProduct
 ATTRS{idVendor}=="273f", ATTRS{idProduct}=="1001", 
ENV{COLOR_MEASUREMENT_DEVICE}="1"
 
 
-# Let udev-acl manage these devices, if it's available
-TEST=="/var/run/ConsoleKit/database", ENV{COLOR_MEASUREMENT_DEVICE}=="*?", 
ENV{ACL_MANAGE}="1"
-
-# Otherwise, restrict access to members of the plugdev group,
-# which the user may have to add to the system.
-ENV{COLOR_MEASUREMENT_DEVICE}=="*?", ENV{ACL_MANAGE}!="*?", MODE="660", 
GROUP="plugdev"
-
 # Set ID_VENDOR and ID_MODEL acording to VID and PID
 IMPORT{program}="usb-db %p"
 
 LABEL="argyll_rules_end"

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to