pool/cups
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 966839 from home:jsmeix:branches:Printing

Browse Source 
Move cups.pc to %{_libdir} if it is not yet there because cups.pc is arch dependent

OBS-URL: https://build.opensuse.org/request/show/966839
OBS-URL: https://build.opensuse.org/package/show/Printing/cups?expand=0&rev=385
This commit is contained in:
Johannes Meixner 2022-04-04 14:08:30 +00:00 committed by Git OBS Bridge
parent afc8c24899
commit cf82b7d5d8
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cups.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Mon Apr 4 12:45:16 UTC 2022 - jsmeix@suse.de
- Have cups.pc in %{_libdir} to avoid a conflict
that cups-devel and cups-devel-32bit would
both contain /usr/lib/pkgconfig/cups.pc because
when cups.pc is arch dependent it has to be in %{_libdir}
which it is because it contains 'libdir=/usr/lib64' on x86_64
(if it was arch independent it would have to be in %{_datadir})
cf. https://build.opensuse.org/request/show/965680
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Mar 4 11:34:13 UTC 2022 - jsmeix@suse.de Fri Mar 4 11:34:13 UTC 2022 - jsmeix@suse.de

10
cups.spec
View File

@ -387,6 +387,14 @@ install -m644 %{SOURCE108} %{buildroot}%{_sysconfdir}/cups/client.conf
# Make the libraries accessible also via generic named links: # Make the libraries accessible also via generic named links:
ln -sf libcupsimage.so.2 %{buildroot}%{_libdir}/libcupsimage.so ln -sf libcupsimage.so.2 %{buildroot}%{_libdir}/libcupsimage.so
ln -sf libcups.so.2 %{buildroot}%{_libdir}/libcups.so ln -sf libcups.so.2 %{buildroot}%{_libdir}/libcups.so
# Move /usr/lib/pkgconfig/cups.pc to _libdir if it is not there
# to avoid a conflict that cups-devel and cups-devel-32bit
# would both contain /usr/lib/pkgconfig/cups.pc because
# when cups.pc is arch dependent it has to be in _libdir
# which it is because it contains 'libdir=/usr/lib64' on x86_64
# (if it was arch independent it would have to be in _datadir)
# cf. https://build.opensuse.org/request/show/965680
test -d %{buildroot}%{_libdir}/pkgconfig || mv %{buildroot}/usr/lib/pkgconfig %{buildroot}%{_libdir}/pkgconfig
# Add missing usual directories: # Add missing usual directories:
install -d -m755 %{buildroot}%{_datadir}/cups/drivers install -d -m755 %{buildroot}%{_datadir}/cups/drivers
install -d -m755 %{buildroot}%{_localstatedir}/cache/cups install -d -m755 %{buildroot}%{_localstatedir}/cache/cups
@ -705,10 +713,10 @@ exit 0
%files devel %files devel
%defattr(-,root,root) %defattr(-,root,root)
/usr/lib/pkgconfig/cups.pc
%{_includedir}/cups/ %{_includedir}/cups/
%{_libdir}/libcups.so %{_libdir}/libcups.so
%{_libdir}/libcupsimage.so %{_libdir}/libcupsimage.so
%{_libdir}/pkgconfig/cups.pc
%files ddk %files ddk
%defattr(-,root,root) %defattr(-,root,root)