OBS User unknown 2007-01-12 16:12:29 +00:00 committed by Git OBS Bridge
parent 91a96d8d2c
commit 0aa18a82a1
2 changed files with 41 additions and 3 deletions

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Fri Jan 12 15:13:35 CET 2007 - jsmeix@suse.de
- Since version 1.6.12 /usr/bin/hpijs is linked with libcups
so that the package hplip-hpijs could be no longer installed
without at least the package cups-libs. Therefore an additional
special /usr/bin/hpijs.without-libcups is built which does not
require the CUPS library.
-------------------------------------------------------------------
Wed Dec 20 14:45:25 CET 2006 - jsmeix@suse.de

View File

@ -1,7 +1,7 @@
#
# spec file for package hplip (Version 1.6.12)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@ -17,10 +17,10 @@ Summary: HP's Printing and Scanning Software
# x.y.m : x = major release number, y = year (eg: 6 = 2006), m = month (eg: 6a = second release in June)
# Official releases have a 3 digit number and release candidates have a 4 digit number: x.y.m.rc
Version: 1.6.12
Release: 1
Release: 11
%define hpijsVersion 2.6.12
Group: Hardware/Printing
License: BSD License and BSD-like, Other License(s), see package
License: BSD License and BSD-like, GNU General Public License (GPL)
URL: http://hpinkjet.sourceforge.net/
# URL for Source0: http://superb-west.dl.sourceforge.net/sourceforge/hplip/hplip-1.6.12.tar.gz
Source0: %{name}-%{version}.tar.bz2
@ -135,6 +135,26 @@ AUTOMAKE='automake --foreign' autoreconf --force --install
# Set -fstack-protector-all to enable "Stack Protector" via a so called "canary" (requires gcc >= 4.1):
export CFLAGS="$RPM_OPT_FLAGS -fstack-protector-all"
export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fstack-protector-all"
# First of all build a special hpijs which does not require the CUPS library.
# One of the HPLIP authors David Suffield told me in a mail:
# > To: Johannes Meixner <jsmeix@suse.de>, <hplip-devel@lists.sourceforge.net>
# > Subject: RE: [HPLIP-Devel] /usr/bin/hpijs requires libcups.so
# > If you want to build hpijs with-out the libcups.so dependency, build
# > hpijs with-out hplip support.
# > For example if you want to build hpijs for use with other spoolers,
# > don't use the top-level hplip makefile, use configure/make in the hpijs
# > directory. There is a hpijs configure time "hplip-build" flag that
# > defaults to false if you don't use the top-level make file.
# To avoid an impact on the normal build of hpijs afterwards
# the specific make target "make hpijs" is called and afterwards
# "make distclean" removes in particular the Makefile to make sure
# it is created anew by the different configure call of the normal build.
pushd prnt/hpijs
./configure --prefix=/usr --libdir=%_libdir --disable-hplip-build --disable-cups-install --disable-foomatic-install
make hpijs
mv hpijs hpijs.without-libcups
make distclean
popd
# Regarding the configure options see tech_docs/tarball_install.html (not very explanatory):
# --disable-rpm-install disables sane, icon, /etc/hp and /etc/init.d install (default = disabled)
# --disable-foomatic-install disables foomatic install (HPIJS option, default = enabled)
@ -155,6 +175,8 @@ make
%install
make install DESTDIR=%{buildroot}
# Install the special hpijs which does not require the CUPS library:
install -m 755 prnt/hpijs/hpijs.without-libcups %{buildroot}%{_bindir}
# Remove the installed /etc/sane.d/dll.conf
# because this is provided by the sane package:
rm %{buildroot}%{_sysconfdir}/sane.d/dll.conf
@ -296,9 +318,16 @@ exit 0
%files hpijs
%defattr(-, root, root)
%{_bindir}/hpijs
%{_bindir}/hpijs.without-libcups
%{_libdir}/libhpip.*
%changelog -n hplip
* Fri Jan 12 2007 - jsmeix@suse.de
- Since version 1.6.12 /usr/bin/hpijs is linked with libcups
so that the package hplip-hpijs could be no longer installed
without at least the package cups-libs. Therefore an additional
special /usr/bin/hpijs.without-libcups is built which does not
require the CUPS library.
* Wed Dec 20 2006 - jsmeix@suse.de
- Updated to version 1.6.12:
Three more supported LaserJet printers.