Accepting request 20573 from Printing

Copy from Printing/cups based on submit request 20573 from user jsmeix

OBS-URL: https://build.opensuse.org/request/show/20573
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cups?expand=0&rev=63

cups.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Wed Aug 26 21:43:03 CEST 2009 - meissner@suse.de
+
+- Fixed as-needed issues when compiling additional tools
+  by using the right ordering of source and linked library
+  in 'gcc -opoll_ppd_base ... SOURCE1 -lcups'
+  and 'gcc -olphelp ... SOURCE2 -lcups' which
+  obsoletes the 'export SUSE_ASNEEDED=0' workaround,
+  see the 'Fri Jul 10 12:34:54 CEST 2009' entry below.
+- Run fdupes.
+
 -------------------------------------------------------------------
 Fri Jul 31 15:08:41 CEST 2009 - jsmeix@suse.de
 

cups.spec

@@ -22,7 +22,7 @@ Name:           cups
 BuildRequires:  avahi-compat-mDNSResponder-devel dbus-1-devel gcc-c++
 BuildRequires:  krb5-devel libpng-devel libtiff-devel openldap2-devel
 BuildRequires:  openslp-devel openssl-devel pam-devel pkg-config tcpd-devel
-BuildRequires:  update-desktop-files
+BuildRequires:  fdupes update-desktop-files
 PreReq:         textutils, fileutils, sh-utils, %insserv_prereq,
 PreReq:         %fillup_prereq /usr/sbin/groupadd
 Url:            http://www.cups.org/
@@ -30,7 +30,7 @@ License:        GPL v2 or later
 Group:          Hardware/Printing
 Summary:        The Common UNIX Printing System
 Version:        1.3.11
-Release:        2
+Release:        3
 Requires:       cups-libs = %{version}, cups-client = %{version}
 Requires:       ghostscript_any, ghostscript-fonts-std, foomatic-filters
 Requires:       util-linux /usr/bin/pdftops
@@ -236,10 +236,6 @@ cp -a %{SOURCE10} .
 %{INSTALL_SCRIPT} %{SOURCE20} krb5-config
 
 %build
-# This package failed to build when testing with -Wl,-as-needed
-# So we disable it here, if you want to retest, delete this comment
-# and the 'export SUSE_ASNEEDED=0' line:
-export SUSE_ASNEEDED=0
 # To build the /usr/lib/cups/filter/pdftops filter
 # (via the configure options --enable-pdftops, --with-pdftops=pdftops)
 # the config-scripts/cups-pdf.m4 tests if there is a pdftops executable in its path
@@ -287,8 +283,8 @@ KRB5CONFIG=${PWD}/krb5-config ./configure \
 #perl -pi -e 's:^(OPTIM\s+\=):$1 -g -DDEBUG:' Makedefs
 make CXX=g++
 # Compile additional tools
-gcc -opoll_ppd_base $CFLAGS -fPIC -fPIE -pie -I. -L./cups -lcups %{SOURCE1}
-gcc -olphelp $CFLAGS -fPIC -fPIE -pie -I. -L./cups -lcups %{SOURCE2}
+gcc -opoll_ppd_base $CFLAGS -fPIC -fPIE -pie -I. -L./cups %{SOURCE1} -lcups 
+gcc -olphelp $CFLAGS -fPIC -fPIE -pie -I. -L./cups %{SOURCE2} -lcups
 
 %install
 make	BUILDROOT=$RPM_BUILD_ROOT \
@@ -368,6 +364,7 @@ install -d $RPM_BUILD_ROOT/etc/sysconfig/SuSEfirewall2.d/services/
 install -m 644 %{SOURCE17} $RPM_BUILD_ROOT/etc/sysconfig/SuSEfirewall2.d/services/cups
 # remove unknown locale directory
 rm -rf $RPM_BUILD_ROOT/usr/share/locale/no
+%fdupes $RPM_BUILD_ROOT
 
 %clean
 #test -n "$RPM_BUILD_ROOT" && rm -rf $RPM_BUILD_ROOT