Updating link to change in openSUSE:Factory/cups revision 73.0
OBS-URL: https://build.opensuse.org/package/show/Printing/cups?expand=0&rev=ad1b1131aea9934ec13c9e95bd231c80
This commit is contained in:
OBS User buildservice-autocommit
Git OBS Bridge
parent
99fd698d72
commit
e2a8bbbcfd
17
cups-1.4.3-default-webcontent-path.patch
Normal file
17
cups-1.4.3-default-webcontent-path.patch
Normal file
@ -0,0 +1,17 @@
|
||||
--- config-scripts/cups-directories.m4.orig 2009-04-13 01:04:51.000000000 +0200
|
||||
+++ config-scripts/cups-directories.m4 2010-05-06 11:34:04.000000000 +0200
|
||||
@@ -323,11 +323,11 @@ fi
|
||||
AC_SUBST(MENUDIR)
|
||||
|
||||
# Documentation files
|
||||
-AC_ARG_WITH(docdir, [ --with-docdir set path for documentation],docdir="$withval",docdir="")
|
||||
+AC_ARG_WITH(docdir, [ --with-docdir set path and DocumentRoot directive for web content, default=datadir/cups/webcontent],docdir="$withval",docdir="")
|
||||
|
||||
if test x$docdir = x; then
|
||||
- CUPS_DOCROOT="$datadir/doc/cups"
|
||||
- docdir="$datadir/doc/cups"
|
||||
+ CUPS_DOCROOT="$datadir/cups/webcontent"
|
||||
+ docdir="$datadir/cups/webcontent"
|
||||
else
|
||||
CUPS_DOCROOT="$docdir"
|
||||
fi
|
||||
14
cups.changes
14
cups.changes
@ -1,3 +1,17 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu May 6 12:39:41 CEST 2010 - jsmeix@suse.de
|
||||
|
||||
- cups-1.4.3-default-webcontent-path.patch changes the default path
|
||||
whereto the web content is installed from /usr/share/doc/...
|
||||
to /usr/share/cups/webcontent because the files of the CUPS
|
||||
web content are no documentation (see CUPS STR #3578 and
|
||||
Novell/Suse Bugzilla bnc#546023 starting at comment#6).
|
||||
- In cups.spec replaced usage of the RPM macro 'name' by the
|
||||
explicite value 'cups' (except for the BuildRoot) so that
|
||||
CUPS could be built as well with a different package name
|
||||
(e.g. when someone likes to provide a CUPS SVN revision
|
||||
as 'cupsSVN' or a specifically adapted CUPS as 'cups4me').
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Apr 27 09:40:34 CEST 2010 - jsmeix@suse.de
|
||||
|
||||
|
||||
40
cups.spec
40
cups.spec
@ -30,7 +30,7 @@ License: GPLv2+ ; LGPLv2.1+
|
||||
Group: Hardware/Printing
|
||||
Summary: The Common UNIX Printing System
|
||||
Version: 1.4.3
|
||||
Release: 2
|
||||
Release: 3
|
||||
# Require the exact matching version-release of the cups-libs sub-package because
|
||||
# non-matching CUPS libraries may let CUPS software crash (e.g. segfault)
|
||||
# because all CUPS software is built from the one same CUPS source tar ball
|
||||
@ -50,6 +50,7 @@ Requires: pdftools_any
|
||||
Suggests: poppler-tools
|
||||
Conflicts: plp lprold lprng
|
||||
Obsoletes: cups-SUSE-ppds-dat
|
||||
Provides: cups-SUSE-ppds-dat
|
||||
# Source0...Source9 is for sources from upstream:
|
||||
# URL for Source0: http://ftp.easysw.com/pub/cups/1.4.3/cups-1.4.3-source.tar.bz2
|
||||
# MD5 sum for Source0 on http://www.cups.org/software.php is e70b1c3f60143d7310c1d74c111a21ab
|
||||
@ -59,6 +60,11 @@ Source0: cups-%{version}-source.tar.bz2
|
||||
# Patch10...Patch99 is for patches from Novell/openSUSE which are intended for upstream:
|
||||
# Patch10 adds 'smb://...' URIs to templates/choose-uri.tmpl:
|
||||
Patch10: cups-1.2rc1-template.patch
|
||||
# Patch11 changes the default path whereto the web content is installed
|
||||
# from /usr/share/doc/cups to /usr/share/cups/webcontent because the
|
||||
# files of the CUPS web content are no documentation, see CUPS STR #3578
|
||||
# and http://bugzilla.novell.com/show_bug.cgi?id=546023#c6 and subsequent comments:
|
||||
Patch11: cups-1.4.3-default-webcontent-path.patch
|
||||
# Source100...Source999 is for private sources from Novell/openSUSE which are not intended for upstream:
|
||||
Source101: cups.init
|
||||
Source102: postscript.ppd.bz2
|
||||
@ -183,11 +189,16 @@ http://www.cups.org
|
||||
|
||||
%prep
|
||||
# Be quiet when unpacking:
|
||||
%setup -q -n %{name}-%{version}
|
||||
%setup -q -n cups-%{version}
|
||||
# Patch0...Patch9 is for patches from upstream:
|
||||
# Patch10...Patch99 is for patches from Novell/openSUSE which are intended for upstream:
|
||||
# Patch10 adds 'smb://...' URIs to templates/choose-uri.tmpl:
|
||||
%patch10 -p1
|
||||
# Patch11 changes the default path whereto the web content is installed
|
||||
# from /usr/share/doc/cups to /usr/share/cups/webcontent because the
|
||||
# files of the CUPS web content are no documentation, see CUPS STR #3578
|
||||
# and http://bugzilla.novell.com/show_bug.cgi?id=546023#c6 and subsequent comments:
|
||||
%patch11
|
||||
# Patch100...Patch999 is for private patches from Novell/openSUSE which are not intended for upstream:
|
||||
# Patch100 adds conf/pam.suse regarding support for PAM for Novell/openSUSE:
|
||||
%patch100
|
||||
@ -208,12 +219,22 @@ autoconf
|
||||
export CXXFLAGS="$CXXFLAGS $RPM_OPT_FLAGS -O2 -fno-strict-aliasing -fstack-protector"
|
||||
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fstack-protector -DLDAP_DEPRECATED"
|
||||
export CXX=g++
|
||||
# As long as cups-1.4.3-default-webcontent-path.patch is applied
|
||||
# configure --with-docdir=... would be no longer needed
|
||||
# because cups-1.4.3-default-webcontent-path.patch changes the
|
||||
# default with-docdir path whereto the web content is installed
|
||||
# from /usr/share/doc/cups to /usr/share/cups/webcontent because the
|
||||
# files of the CUPS web content are no documentation, see CUPS STR #3578
|
||||
# and http://bugzilla.novell.com/show_bug.cgi?id=546023#c6 and subsequent comments
|
||||
# so that the new default could be used as is but upstream may accept
|
||||
# cups-1.4.3-default-webcontent-path.patch in general but change its default
|
||||
# so that with-docdir is explicitely set here to be future proof:
|
||||
./configure \
|
||||
--mandir=%{_mandir} \
|
||||
--sysconfdir=%{_sysconfdir} \
|
||||
--libdir=%{_libdir} \
|
||||
--datadir=%{_datadir} \
|
||||
--with-docdir=%{_defaultdocdir}/%{name} \
|
||||
--with-docdir=%{_datadir}/cups/webcontent \
|
||||
--with-cups-user=lp \
|
||||
--with-cups-group=lp \
|
||||
--enable-pie \
|
||||
@ -257,15 +278,14 @@ install -m 644 -D %{SOURCE104} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/cups-lpd
|
||||
ln -sf libcupsimage.so.2 $RPM_BUILD_ROOT%{_libdir}/libcupsimage.so
|
||||
ln -sf libcups.so.2 $RPM_BUILD_ROOT%{_libdir}/libcups.so
|
||||
# Add missing usual directories:
|
||||
install -d -m755 $RPM_BUILD_ROOT/usr/share/cups/drivers
|
||||
install -d -m755 $RPM_BUILD_ROOT%{_datadir}/cups/drivers
|
||||
install -d -m755 $RPM_BUILD_ROOT/var/cache/cups
|
||||
install -d -m755 $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name}
|
||||
install -d -m755 $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name}/images
|
||||
# Add conf/pam.suse regarding support for PAM (see Patch100: cups-pam.diff):
|
||||
install -m 644 -D conf/pam.suse $RPM_BUILD_ROOT/etc/pam.d/cups
|
||||
# Add missing usual documentation:
|
||||
install -d -m755 $RPM_BUILD_ROOT/%{_defaultdocdir}/cups
|
||||
for f in CHANGES*.txt CREDITS.txt INSTALL.txt LICENSE.txt README.txt
|
||||
do install -m 644 "$f" $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/
|
||||
do install -m 644 "$f" $RPM_BUILD_ROOT%{_defaultdocdir}/cups/
|
||||
done
|
||||
# Source102: postscript.ppd.bz2
|
||||
bzip2 -cd < %{SOURCE102} > $RPM_BUILD_ROOT%{_datadir}/cups/model/Postscript.ppd
|
||||
@ -285,7 +305,7 @@ do # Change default paper size from Letter to A4 if possible
|
||||
done
|
||||
# Add files for desktop menu:
|
||||
rm -f $RPM_BUILD_ROOT/usr/share/applications/cups.desktop
|
||||
%suse_update_desktop_file -i -r %name PrintingUtility 2>/dev/null
|
||||
%suse_update_desktop_file -i -r cups PrintingUtility 2>/dev/null
|
||||
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
|
||||
@ -351,15 +371,15 @@ exit 0
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%config(noreplace) %attr(640,root,lp) %{_sysconfdir}/cups/cupsd.conf
|
||||
%{_sysconfdir}/cups/cupsd.conf.default
|
||||
%config(noreplace) %attr(640,root,lp) %{_sysconfdir}/cups/snmp.conf
|
||||
%config(noreplace) %attr(755,lp,lp) %{_sysconfdir}/cups/interfaces
|
||||
%config(noreplace) %{_sysconfdir}/xinetd.d/cups-lpd
|
||||
%config %attr(0755,root,root) %{_sysconfdir}/init.d/cups
|
||||
%config %{_sysconfdir}/pam.d/cups
|
||||
%config %{_sysconfdir}/dbus-1/system.d/cups.conf
|
||||
%dir %attr(700,root,lp) %{_sysconfdir}/cups/ssl
|
||||
%dir %attr(755,root,lp) %{_sysconfdir}/cups/ppd
|
||||
%{_sysconfdir}/cups/cupsd.conf.default
|
||||
%{_sysconfdir}/dbus-1/system.d/cups.conf
|
||||
/var/adm/fillup-templates/sysconfig.cups
|
||||
%{_bindir}/cupstestppd
|
||||
%{_sbindir}/cupsaddsmb
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user