mirror of
https://abf.rosa.ru/djam/hplip.git
synced 2025-02-23 16:32:58 +00:00
Added libhpipp subpackage
This commit is contained in:
Denis Silakov
parent
e067cb4f07
commit
865eddc6a0
2 changed files with 35 additions and 5 deletions
12
hplip-3.15.6-hpipp_linkage.patch
Normal file
12
hplip-3.15.6-hpipp_linkage.patch
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
diff -Naur hplip-3.15.6.orig/Makefile.am hplip-3.15.6/Makefile.am
|
||||
--- hplip-3.15.6.orig/Makefile.am 2015-06-17 13:45:49.385359446 +0300
|
||||
+++ hplip-3.15.6/Makefile.am 2015-06-17 13:45:56.173359044 +0300
|
||||
@@ -255,7 +255,7 @@
|
||||
#hpipp_la_LDFLAGS = -module -avoid-version
|
||||
libhpipp_la_SOURCES = protocol/hp_ipp.c protocol/hp_ipp.h protocol/hp_ipp_i.h
|
||||
libhpipp_la_CFLAGS = -DCONFDIR=\"$(hplip_confdir)\"
|
||||
-libhpipp_la_LDFLAGS = -version-info 0:1:0
|
||||
+libhpipp_la_LDFLAGS = -version-info 0:1:0 -lcups
|
||||
libhpipp_la_LIBADD = libhpmud.la
|
||||
|
||||
|
||||
28
hplip.spec
28
hplip.spec
|
|
@ -5,6 +5,7 @@
|
|||
|
||||
%define major 0
|
||||
%define libhpip %mklibname hpip %{major}
|
||||
%define libhpipp %mklibname hpipp %{major}
|
||||
%define libhpmud %mklibname hpmud %{major}
|
||||
%define sanemaj 1
|
||||
%define libsane %mklibname sane-hpaio %{sanemaj}
|
||||
|
|
@ -83,6 +84,7 @@ Patch228: hpaio-option-duplex.diff
|
|||
|
||||
Patch302: hplip-CVE-2013-4325.patch
|
||||
Patch303: hplip-3.13.10-fix-systray-x.patch
|
||||
Patch304: hplip-3.15.6-hpipp_linkage.patch
|
||||
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: imagemagick
|
||||
|
|
@ -120,7 +122,7 @@ Requires: python3-reportlab
|
|||
Requires: python3-dbus
|
||||
Requires: polkit-agent
|
||||
Requires: usermode-consoleonly
|
||||
Requires: python3-gobject
|
||||
Requires: python3-gobject3
|
||||
# Required by hp-scan for command line scanning
|
||||
Requires: python3-pillow
|
||||
Requires: sane-backends-hpaio
|
||||
|
|
@ -130,6 +132,7 @@ Requires: wget
|
|||
Requires: acl
|
||||
# hplip tools use internal symbols from libhplip that can change among versions
|
||||
Requires: %{libhpip} = %{version}
|
||||
Requires: %{libhpipp} = %{version}
|
||||
# Some HP ppds are in foomatic-db and foomatic-db-hpijs (mdv bug #47415)
|
||||
Suggests: foomatic-db-hpijs
|
||||
# hp-doctor requires gui modules
|
||||
|
|
@ -167,6 +170,13 @@ Group: System/Printing
|
|||
%description -n %{libhpip}
|
||||
Library needed for the "hplip" HP printer/all-in-one drivers
|
||||
|
||||
%package -n %{libhpipp}
|
||||
Summary: Dynamic library for the "hplip" HP printer/all-in-one drivers
|
||||
Group: System/Printing
|
||||
|
||||
%description -n %{libhpipp}
|
||||
Library needed for the "hplip" HP printer/all-in-one drivers
|
||||
|
||||
%package -n %{libhpmud}
|
||||
Summary: Dynamic library for the "hplip" HP printer/all-in-one drivers
|
||||
Group: System/Printing
|
||||
|
|
@ -179,6 +189,7 @@ Library needed for the "hplip" HP printer/all-in-one drivers
|
|||
Summary: Headers and links to compile against the "%{libhpip}" ("hplip") library
|
||||
Group: Development/C
|
||||
Requires: %{libhpip} >= %{version}-%{release}
|
||||
Requires: %{libhpipp} >= %{version}-%{release}
|
||||
Requires: %{libhpmud} >= %{version}-%{release}
|
||||
Requires: %{libsane} >= %{version}-%{release}
|
||||
Provides: libhpip-devel = %{version}-%{release}
|
||||
|
|
@ -443,6 +454,8 @@ sed -i.duplex-constraints \
|
|||
|
||||
%patch303 -p1
|
||||
|
||||
%patch304 -p1
|
||||
|
||||
sed -i.duplex-constraints \
|
||||
-e 's,\(UIConstraints.* \*Duplex\),//\1,' \
|
||||
prnt/drv/hpcups.drv.in
|
||||
|
|
@ -513,7 +526,7 @@ make install-libLTLIBRARIES \
|
|||
install-pcardextLTLIBRARIES \
|
||||
install-scanextLTLIBRARIES \
|
||||
DESTDIR=%{buildroot} PYTHON=/usr/bin/python
|
||||
rm -f %{buildroot}%{python_sitearch}/*.la
|
||||
rm -f %{buildroot}%{py_platsitedir}/*.la
|
||||
popd
|
||||
|
||||
|
||||
|
|
@ -551,7 +564,7 @@ rm -f %{buildroot}%{_datadir}/hplip/hpijs.drv.in.template
|
|||
rm -f %{buildroot}%{_datadir}/cups/mime/pstotiff.types
|
||||
rm -f %{buildroot}%{_datadir}/hplip/fax/pstotiff*
|
||||
rm -f %{buildroot}%{_cups_serverbin}/filter/hpcac
|
||||
rm -f %{buildroot}%{python3_sitearch}/*.la
|
||||
rm -f %{buildroot}%{py3_platsitedir}/*.la
|
||||
|
||||
|
||||
mkdir -p %{buildroot}%{_datadir}/applications
|
||||
|
|
@ -757,7 +770,7 @@ fi
|
|||
|
||||
%exclude %{_datadir}/hplip/data/models
|
||||
# C libraries for Python
|
||||
%{_libdir}/python*/*/*.so*
|
||||
%{_libdir}/python3*/*/*.so*
|
||||
# CUPS backends (0755 permissions, so that CUPS 1.2 runs these backends
|
||||
# as lp user)
|
||||
# Note: this must be /usr/lib not %{_libdir}, since that's the
|
||||
|
|
@ -771,6 +784,7 @@ fi
|
|||
%{_datadir}/cups/drv/hp/hpcups.drv
|
||||
# Files
|
||||
%dir %{_datadir}/hplip
|
||||
%{_datadir}/hplip/__pycache__
|
||||
%{_datadir}/hplip/align.py*
|
||||
%{_datadir}/hplip/check-plugin.py*
|
||||
%{_datadir}/hplip/clean.py*
|
||||
|
|
@ -838,6 +852,9 @@ fi
|
|||
%files -n %{libhpip}
|
||||
%{_libdir}/libhpip.so.%{major}*
|
||||
|
||||
%files -n %{libhpipp}
|
||||
%{_libdir}/libhpipp.so.%{major}*
|
||||
|
||||
%files -n %{libhpmud}
|
||||
%{_libdir}/libhpmud.so.%{major}*
|
||||
|
||||
|
|
@ -845,6 +862,7 @@ fi
|
|||
%{_includedir}/hpip.h
|
||||
%{_includedir}/xform.h
|
||||
%{_libdir}/libhpip.so
|
||||
%{_libdir}/libhpipp.so
|
||||
%{_libdir}/libhpmud.so
|
||||
%if %{sane_backend}
|
||||
%{_libdir}/sane/libsane-hpaio.so
|
||||
|
|
@ -855,7 +873,7 @@ fi
|
|||
|
||||
%files compat-libs
|
||||
# Python extensions
|
||||
%{python_sitearch}/*.so
|
||||
%{py_platsitedir}/*.so
|
||||
|
||||
%files model-data
|
||||
/lib/udev/rules.d/*.rules
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue