Hello community,
here is the log from the commit of package cups-drivers for openSUSE:Factory
checked in at Fri Sep 3 16:14:17 CEST 2010.
--------
--- cups-drivers/cups-drivers.changes 2010-08-06 14:14:48.000000000 +0200
+++ cups-drivers/cups-drivers.changes 2010-08-13 16:12:49.000000000 +0200
@@ -1,0 +2,6 @@
+Fri Aug 13 15:51:05 CEST 2010 - jsmeix@suse.de
+
+- Split gutenprint from the cups-drivers package to have it as a
+ stand-alone package (see Novell/openSUSE Bugzilla bnc#514994).
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
gutenprint-5.2.3-A4.patch
gutenprint-5.2.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cups-drivers.spec ++++++
--- /var/tmp/diff_new_pack.WngSxg/_old 2010-09-03 16:12:32.000000000 +0200
+++ /var/tmp/diff_new_pack.WngSxg/_new 2010-09-03 16:12:32.000000000 +0200
@@ -28,7 +28,7 @@
Group: Hardware/Printing
Summary: Drivers for the Common UNIX Printing System
Version: 1.3.9
-Release: 14
+Release: 15
Provides: cups_drv
Requires: ghostscript-library >= 7.05, foomatic-filters
PreReq: sh-utils, procps
@@ -45,16 +45,12 @@
# linuxprinting.org database variables
%define DBDate 20080909
%define foomaticver bzr
-%define gutenprintver 5.2.4
-%define gutenprintmajor 5.2
%define splixver 1.1.1
%define m2300wver 0.51
#URL: http://www.linuxprinting.org/download/foomatic/
Source0: http://www.linuxprinting.org/download/foomatic/foomatic-db-engine-%{foomaticver}-%{DBDate}.tar.bz2
Source1: http://www.linuxprinting.org/download/foomatic/foomatic-filters-%{foomaticver}-%{DBDate}.tar.bz2
Source2: http://www.linuxprinting.org/download/foomatic/foomatic-db-%{foomaticver}-%{DBDate}.tar.bz2
-# make sure that gimp-print version NEVER differs from ghostscript-library
-Source3: gutenprint-%{gutenprintver}.tar.bz2
Source5: http://heanet.dl.sourceforge.net/sourceforge/m2300w/m2300w-%{m2300wver}.tar.bz2
Source100: foomatic-driver.known
Source101: foomatic-driver.unsupported
@@ -66,7 +62,6 @@
Patch5: cups-drivers-1.3.8-Samsung-CLP-550.patch
Patch6: cups-drivers-1.3.8-gcc_warn.patch
Patch7: cups-drivers-1.3.9-maxspot_compare.patch
-Patch300: gutenprint-5.2.3-A4.patch
Patch500: m2300w-0.51-foomatic.patch
Patch501: m2300w-0.51-resolution.patch
Patch502: m2300w-0.51-disable_gs_test.patch
@@ -83,58 +78,6 @@
--------
Grant Taylor
-%package -n gutenprint
-License: GPLv2+
-Summary: Gutenprint drivers for CUPS
-Group: Hardware/Printing
-Requires: ghostscript-library >= 7.05, cups >= 1.2.2, pstoraster
-Version: %{gutenprintver}
-Release: 14
-Obsoletes: cups-drivers-stp
-Provides: cups-drivers-stp
-PreReq: procps
-
-%description -n gutenprint
-This package contains the gutenprint drivers (formerly known as
-gimp-print drivers) for CUPS.
-
-
-
-%package -n gutenprint-devel
-License: GPLv2+
-Summary: Development Environment for Gutenprint
-Group: Hardware/Printing
-Version: %{gutenprintver}
-Release: 14
-Requires: ghostscript-library >= 7.05, cups >= 1.2.2, gutenprint = %{gutenprintver}
-Requires: gtk2-devel, glibc-devel
-
-%description -n gutenprint-devel
-This package contains the development environment for the gutenprint
-printer drivers.
-
-
-
-Authors:
---------
- Grant Taylor
-
-%package -n gutenprint-gimpplugin
-License: GPLv2+
-Summary: GIMP plug-in for gutenprint
-Group: Hardware/Printing
-Version: %{gutenprintver}
-Release: 14
-
-%description -n gutenprint-gimpplugin
-This package contains the gutenprint GIMP plug-in.
-
-
-
-Authors:
---------
- Grant Taylor
-
%define INSTALL install -m755 -s
%define INSTALL_SCRIPT install -m755
%define INSTALL_DIR install -d -m755
@@ -148,8 +91,6 @@
mv foomatic-filters-%{foomaticver}-%{DBDate} foomatic-filters
%setup -q -T -D -a 2 -n %{name}
mv foomatic-db-%{foomaticver}-%{DBDate} foomatic-db
-%setup -q -T -D -a 3 -n %{name}
-mv gutenprint-%{gutenprintver} gutenprint
%setup -q -T -D -a 5 -n %{name}
mv m2300w-%{m2300wver} m2300w
%patch0 -p1
@@ -161,10 +102,6 @@
%patch6 -p1
%patch7 -p1
#
-pushd gutenprint
-%patch300 -p1
-popd
-#
#
pushd m2300w
%patch500 -p1
@@ -236,9 +173,6 @@
# unusable printer/driver combos.
perl ./foomatic-cleanupdrivers ../foomatic-db
#
-# Add the Foomatic data for gutenprint
-perl ./foomatic-kitload -k ../gutenprint/src/foomatic/foomatic-db/gutenprint-ijs.%{gutenprintmajor} -f
-#
# Correct the default drivers of the printer entries to have a valid
# default for every printer.
perl ./foomatic-preferred-driver
@@ -260,7 +194,7 @@
PREFIX=%{_prefix} \
DESTDIR=$mydir/foomatic-db-engine \
install
-echo "BuildRoot = '$RPM_BUILD_ROOT'"
+echo "Using BuildRoot: '$RPM_BUILD_ROOT'"
cd ../foomatic-db-engine
mkdir -p $mydir/foomatic-db-engine/usr/share/foomatic/templates
make \
@@ -308,34 +242,6 @@
done
cd ..
#
-##### GUTENPRINT
-# start with gutenprint and generate foomatic files.
-export PATH=$PATH":$mydir"
-pushd gutenprint
-CFLAGS="$RPM_OPT_FLAGS -fstack-protector -fno-strict-aliasing -I/usr/include/gtk-2.0 -I/usr/include/cairo -I/usr/include/glib-2.0 -I%{_libdir}/gtk-2.0/include -I%{_libdir}/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/gimp-2.0" ./configure \
- --prefix=%{_prefix} \
- --mandir=%{_mandir} \
- --infodir=%{_infodir} \
- --sysconfdir=%{_sysconfdir} \
- --libdir=%{_libdir} \
- --disable-static \
- --enable-shared \
- --enable-cups-ppds \
- --enable-translated-cups-ppds=no \
- --enable-simplified-cups-ppds=yes \
- --disable-libgutenprintui \
- --enable-libgutenprintui2 \
- --enable-samples \
- --enable-escputil \
- --with-pic=yes \
- --with-foomatic \
- --with-foomatic3 \
- --without-gimp \
- --with-gimp2 \
- --with-ghostscript
-make
-popd
-#
##### Minolta 2300W
#
cd m2300w
@@ -399,41 +305,6 @@
fi
popd
#
-##### GUTENPRINT
-#
-cd gutenprint
-make DESTDIR=$RPM_BUILD_ROOT \
- FOOMATIC_KITLOAD=${RPM_BUILD_DIR}/%{name}/foomatic-db-engine/foomatic-kitload \
- install
-# Work with upstream compliant CUPS 1.4 on all platforms
-# which means to have a fixed "/usr/lib/cups/" directory
-# on all platforms (see Novell/Suse Bugzilla bnc#575544):
-for D in lib32 lib64
-do for F in commandtocanon commandtoepson rastertogutenprint.%{gutenprintmajor}
- do if test -e $RPM_BUILD_ROOT/usr/$D/cups/filter/$F
- then mv -f $RPM_BUILD_ROOT/usr/$D/cups/filter/$F $RPM_BUILD_ROOT/usr/lib/cups/filter/$F
- fi
- done
- F="gutenprint.%{gutenprintmajor}"
- if test -e $RPM_BUILD_ROOT/usr/$D/cups/driver/$F
- then mv -f $RPM_BUILD_ROOT/usr/$D/cups/driver/$F $RPM_BUILD_ROOT/usr/lib/cups/driver/$F
- fi
-done
-#
-mv $RPM_BUILD_ROOT/%{_datadir}/cups/model/gutenprint/%{gutenprintmajor}/C \
- $RPM_BUILD_ROOT/%{_datadir}/cups/model
-rm $RPM_BUILD_ROOT/usr/share/locale/*/gutenprint_*.po
-rmdir $RPM_BUILD_ROOT/%{_datadir}/cups/model/gutenprint/%{gutenprintmajor}
-rmdir $RPM_BUILD_ROOT/%{_datadir}/cups/model/gutenprint
-mv $RPM_BUILD_ROOT/%{_datadir}/cups/model/C \
- $RPM_BUILD_ROOT/%{_datadir}/cups/model/gutenprint
-cd ..
-#
-mv $RPM_BUILD_ROOT/%{_bindir}/testpattern $RPM_BUILD_ROOT/%{_libdir}/gutenprint/%{gutenprintmajor}
-#
-##### GUTENPRINT (end)
-#
-#
# unpack the PPDs for modification (next step)
set +x
echo "unpacking PPD files..."
@@ -470,14 +341,6 @@
s/^\*FoomaticRIPOptionSetting Resolution\=default: .*\n//;' \
"$PPDFILE" > /dev/null
done
-# append "black and white only" to gutenprint stp-hp-clj* PPDs (bugzilla#220079)
-echo "Appending \"black and white only\" to some gutenprint HP printers"
-find $RPM_BUILD_ROOT/usr/share/cups/model/gutenprint -name "stp-hp-clj_*.ppd" | \
- while read PPDFILE; do
- perl -pi -e \
- 's/^(\*NickName: "HP Color LaserJet.*)"/$1 black and white only"/;' \
- "$PPDFILE" > /dev/null
-done
### if [ ! -f $RPM_SOURCE_DIR/CPUs ]; then
### exit 1;
### fi
@@ -512,8 +375,6 @@
install -d -m 755 $RPM_BUILD_ROOT/usr/lib/printdriver
# set LSB symlink to let CUPS find the PPDs
ln -s /usr/share/ppd $RPM_BUILD_ROOT/usr/share/cups/model/0-driverppds
-#
-%find_lang gutenprint
%clean
test -n "$RPM_BUILD_ROOT" &&
@@ -530,16 +391,6 @@
fi
exit 0
-%post -n gutenprint
-%run_ldconfig
-# send CUPS daemon signal to import new files
-if test -x /etc/init.d/cups && /etc/init.d/cups status >/dev/null ; then
- /etc/init.d/cups reload >/dev/null || /bin/true
-fi
-exit 0
-
-%postun -n gutenprint
-%run_ldconfig
# ------- %Files ---------------------------------------------------------
%files
@@ -562,43 +413,4 @@
/usr/share/m2300w/%{m2300wver}/psfiles/*
%doc %{_defaultdocdir}/%{name}
-%files -n gutenprint -f gutenprint.lang
-%defattr(-,root,root)
-%config /etc/cups/command.types
-%{_bindir}/cups-calibrate
-%{_bindir}/escputil
-%{_bindir}/ijsgutenprint.%{gutenprintmajor}
-/usr/lib/cups/filter/commandtocanon
-/usr/lib/cups/filter/commandtoepson
-/usr/lib/cups/filter/rastertogutenprint.%{gutenprintmajor}
-%{_sbindir}/cups-genppd*
-%dir /usr/share/cups
-%dir /usr/share/cups/model
-/usr/share/cups/calibrate.ppm
-%dir /usr/share/cups/model/gutenprint
-/usr/share/cups/model/gutenprint/*
-%dir %{_libdir}/gutenprint
-%dir %{_libdir}/gutenprint/%{gutenprintmajor}
-%{_libdir}/gutenprint/%{gutenprintmajor}/*
-%{_libdir}/libgutenprint*.so?*
-%dir /usr/share/gutenprint
-/usr/share/gutenprint/*
-%doc /usr/share/man/man?/*.gz
-%dir /usr/lib/cups/driver
-/usr/lib/cups/driver/gutenprint.%{gutenprintmajor}
-
-%files -n gutenprint-devel
-%defattr(-,root,root)
-%dir /usr/include/gutenprint
-/usr/include/gutenprint/*
-%dir /usr/include/gutenprintui2
-/usr/include/gutenprintui2/*
-%{_libdir}/libgutenprint*.la
-%{_libdir}/pkgconfig/gutenprint*
-%{_libdir}/libgutenprint*.so
-
-%files -n gutenprint-gimpplugin
-%defattr(-,root,root)
-%{_libdir}/gimp/2.0/plug-ins/*
-
%changelog
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org