- Added a 'conflicts:' for kdelibs to prevent bug #192548.
This commit is contained in:
parent
6697a7baf9
commit
fb731fd876
14
cups.spec
14
cups.spec
@ -49,6 +49,9 @@ Prereq: /usr/sbin/alternatives
|
|||||||
Obsoletes: lpd lpr LPRng <= 3.8.15-3
|
Obsoletes: lpd lpr LPRng <= 3.8.15-3
|
||||||
Provides: lpd lpr LPRng = 3.8.15-3
|
Provides: lpd lpr LPRng = 3.8.15-3
|
||||||
|
|
||||||
|
# kdelibs conflict for bug #192585.
|
||||||
|
Conflicts: kdelibs < 6:3.5.2-6
|
||||||
|
|
||||||
BuildPrereq: pam-devel pkgconfig
|
BuildPrereq: pam-devel pkgconfig
|
||||||
BuildPrereq: gnutls-devel libacl-devel
|
BuildPrereq: gnutls-devel libacl-devel
|
||||||
BuildRequires: openldap-devel
|
BuildRequires: openldap-devel
|
||||||
@ -176,11 +179,6 @@ install -c -m 755 %{SOURCE12} $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/cups
|
|||||||
install -c -m 644 %{SOURCE13} $RPM_BUILD_ROOT%{_sysconfdir}/cups/pdftops.conf
|
install -c -m 644 %{SOURCE13} $RPM_BUILD_ROOT%{_sysconfdir}/cups/pdftops.conf
|
||||||
ln -s ../doc/%{name}-%{version} $RPM_BUILD_ROOT%{_datadir}/%{name}/doc
|
ln -s ../doc/%{name}-%{version} $RPM_BUILD_ROOT%{_datadir}/%{name}/doc
|
||||||
|
|
||||||
# Make the parallel backend run as root, at least until KDEPrint is fixed
|
|
||||||
# not to incorrectly write 'Group sys' into cupsd.conf (bug #192548,
|
|
||||||
# bug #192585).
|
|
||||||
chmod 0700 $RPM_BUILD_ROOT%{cups_serverbin}/backend/parallel
|
|
||||||
|
|
||||||
# Deal with users trying to access the admin tool at
|
# Deal with users trying to access the admin tool at
|
||||||
# /usr/share/doc/cups-%{version}/index.html rather than the
|
# /usr/share/doc/cups-%{version}/index.html rather than the
|
||||||
# correct http://localhost:631/
|
# correct http://localhost:631/
|
||||||
@ -381,10 +379,8 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%{cups_serverbin}/daemon/cups-lpd
|
%{cups_serverbin}/daemon/cups-lpd
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Sun May 21 2006 Tim Waugh <twaugh@redhat.com>
|
* Mon May 22 2006 Tim Waugh <twaugh@redhat.com>
|
||||||
- Make the parallel backend run as root, at least until KDEPrint is fixed
|
- Added a 'conflicts:' for kdelibs to prevent bug #192548.
|
||||||
not to incorrectly write 'Group sys' into cupsd.conf (bug #192548,
|
|
||||||
bug #192585).
|
|
||||||
|
|
||||||
* Sat May 20 2006 Tim Waugh <twaugh@redhat.com> 1:1.2.0-6
|
* Sat May 20 2006 Tim Waugh <twaugh@redhat.com> 1:1.2.0-6
|
||||||
- Sync to svn5555. No longer need str1670 or str1705 patches.
|
- Sync to svn5555. No longer need str1670 or str1705 patches.
|
||||||
|
Loading…
Reference in New Issue
Block a user