Hello community,
here is the log from the commit of package cups for openSUSE:Factory checked in at 2012-09-10 15:21:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cups (Old)
and /work/SRC/openSUSE:Factory/.cups.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cups", Maintainer is "jsmeix@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/cups/cups.changes 2012-05-29 11:36:40.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.cups.new/cups.changes 2012-09-10 15:21:08.000000000 +0200
@@ -1,0 +2,19 @@
+Tue Sep 4 14:55:57 UTC 2012 - cfarrell@suse.com
+
+- license update: SUSE-GPL-2.0-with-openssl-exception and LGPL-2.1
+ Apple grant an openssl linking exception (and an exception for linking on
+ Apple owned operating systems)
+
+-------------------------------------------------------------------
+Wed Aug 1 11:32:13 CEST 2012 - jsmeix@suse.de
+
+- Save /etc/cups/cupsd.conf and /etc/cups/cupsd.conf.default
+ from becoming hardlinked via the fdupes run in cups.spec
+ (see the 'Wed Aug 26 21:43:03 CEST 2009' entry below)
+ by making their content different and at the same time
+ fix the misleading comment (openSUSE Bugzilla bnc#773971).
+- Minor clean-up in cups.spec (the "Remove unpackaged files"
+ via "rm -rf ") is no longer needed because
+ those man pages are no longer installed.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cups.spec ++++++
--- /var/tmp/diff_new_pack.0i8Qcl/_old 2012-09-10 15:21:11.000000000 +0200
+++ /var/tmp/diff_new_pack.0i8Qcl/_new 2012-09-10 15:21:11.000000000 +0200
@@ -15,6 +15,7 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+
Name: cups
BuildRequires: avahi-compat-mDNSResponder-devel
BuildRequires: dbus-1-devel
@@ -52,7 +53,7 @@
PreReq: textutils
Url: http://www.cups.org/
Summary: The Common UNIX Printing System
-License: GPL-2.0+ ; LGPL-2.1+
+License: SUSE-GPL-2.0-with-openssl-exception and LGPL-2.1
Group: Hardware/Printing
# Source0...Source9 is for sources from upstream:
# URL for Source0: http://ftp.easysw.com/pub/cups/1.5.3/cups-1.5.3-source.tar.bz2
@@ -154,7 +155,7 @@
%package libs
Summary: Libraries for CUPS
-License: GPL-2.0+ ; LGPL-2.1+
+License: SUSE-GPL-2.0-with-openssl-exception and LGPL-2.1
Group: Hardware/Printing
# Prerequire /sbin/ldconfig which is used in the traditional bash scriptlets for post/postun:
PreReq: /sbin/ldconfig
@@ -175,7 +176,7 @@
%package client
Summary: CUPS Client Programs
-License: GPL-2.0+
+License: SUSE-GPL-2.0-with-openssl-exception
Group: Hardware/Printing
# Conflicts with other print spoolers which provide same binaries like /usr/bin/lp and so on:
Conflicts: lprng
@@ -204,7 +205,7 @@
%package devel
Summary: Development Environment for CUPS
-License: GPL-2.0+
+License: SUSE-GPL-2.0-with-openssl-exception
Group: Development/Libraries/C and C++
# Do not require the exact matching version-release of cups-libs
# but only a cups-libs package with matching version because
@@ -229,7 +230,7 @@
%package ddk
Summary: CUPS Driver Development Kit
-License: GPL-2.0+
+License: SUSE-GPL-2.0-with-openssl-exception
Group: Hardware/Printing
Requires: cups = %{version}
Requires: cups-devel = %{version}
@@ -390,13 +391,19 @@
mkdir $RPM_BUILD_ROOT/usr/share/pixmaps
install -m 644 $RPM_BUILD_ROOT/usr/share/icons/hicolor/64x64/apps/cups.png $RPM_BUILD_ROOT/usr/share/pixmaps
rm -rf $RPM_BUILD_ROOT/usr/share/icons
-# Remove unpackaged files:
-rm -rf $RPM_BUILD_ROOT/%{_mandir}/es/cat?
-rm -rf $RPM_BUILD_ROOT/%{_mandir}/fr/cat?
-rm -rf $RPM_BUILD_ROOT/%{_mandir}/cat?
-# Norwegian is "nb", "zh" is probablyx "zh_CN"
+# Norwegian is "nb", "zh" is probably "zh_CN"
mv $RPM_BUILD_ROOT/usr/share/locale/{no,nb}
mv $RPM_BUILD_ROOT/usr/share/locale/{zh,zh_CN}
+# Save /etc/cups/cupsd.conf and /etc/cups/cupsd.conf.default from becoming hardlinked
+# via the fdupes run below, see https://bugzilla.novell.com/show_bug.cgi?id=773971
+# by making their content different and at the same time fix the misleading comment.
+# Intentionally let the build fail if 'grep' does not find what 'sed' should change
+# because if upstream changed it 'sed' would silently no longer change the files
+# so that fdupes would make /etc/cups/cupsd.conf and /etc/cups/cupsd.conf.default hardlinked:
+grep -q '^# Sample configuration ' $RPM_BUILD_ROOT/%{_sysconfdir}/cups/cupsd.conf
+sed -i -e 's/^# Sample configuration /# Configuration /' $RPM_BUILD_ROOT/%{_sysconfdir}/cups/cupsd.conf
+grep -q '^# Sample configuration ' $RPM_BUILD_ROOT/%{_sysconfdir}/cups/cupsd.conf.default
+sed -i -e 's/^# Sample configuration /# Default configuration /' $RPM_BUILD_ROOT/%{_sysconfdir}/cups/cupsd.conf.default
# Run fdupes:
%fdupes $RPM_BUILD_ROOT
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org