From 4cbe6f8acf9c582bad30e7fb84c1e9331ba68ab6 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Tue, 11 Jan 2022 08:55:08 +0100 Subject: [PATCH] gutenprint.spec: Remove static libraries shipped by mistake The static libraries were shipped because minor version of gutenprint changed and removing command failed with stopping the build. Now the spec file automatically generates majorver.minorver string, which is further used in spec file and it should prevent the mistake which caused shipping static libraries in the past. --- gutenprint.spec | 66 +++++++++++++++++++++++++++++++++++-------------- 1 file changed, 47 insertions(+), 19 deletions(-) diff --git a/gutenprint.spec b/gutenprint.spec index 15061e9..392390c 100644 --- a/gutenprint.spec +++ b/gutenprint.spec @@ -1,10 +1,14 @@ #%%global prever pre2 #%%global ver %%{version}-%%{prever} +# change with every change of major or minor version number +#%%global majminver 5.3 +%global majminver ${echo %{version} | sed -E 's/\.[0-9]+$//'} + Name: gutenprint Summary: Printer Drivers Package Version: 5.3.4 -Release: 5%{?dist} +Release: 6%{?dist} URL: http://gimp-print.sourceforge.net/ Source0: http://downloads.sourceforge.net/gimp-print/%{name}-%{version}.tar.xz # Post-install script to update CUPS native PPDs. @@ -25,28 +29,48 @@ License: GPLv2+ Requires: %{name}-libs%{?_isa} = %{version}-%{release} +# autoreconf +BuildRequires: autoconf +BuildRequires: automake +# we remove rpath during %%install +BuildRequires: chrpath +# we use CUPS functions in CUPS driver +BuildRequires: cups +BuildRequires: cups-devel +BuildRequires: cups-libs # gcc is no longer in buildroot by default -BuildRequires: gcc +BuildRequires: gcc +# for language support +BuildRequires: gettext-devel +# for JPEG, PNG and TIFF file format support +BuildRequires: libjpeg-devel +BuildRequires: libpng-devel +BuildRequires: libtiff-devel +# for autoreconf +BuildRequires: libtool # uses make -BuildRequires: make -BuildRequires: cups-libs, cups-devel, cups -BuildRequires: gettext-devel,pkgconfig -BuildRequires: libtiff-devel,libjpeg-devel,libpng-devel -BuildRequires: pkgconfig(libusb-1.0) -BuildRequires: pkgconfig(gtk+-2.0) +BuildRequires: make +# we use pkgconfig in spec file to get correct devel packages +BuildRequires: pkgconfig +# gutenprint library uses functions from GTK2 for gutenprint UI library +BuildRequires: pkgconfig(gtk+-2.0) +# for gutenprint usb backend gutenprintMAJMIN+usb +BuildRequires: pkgconfig(libusb-1.0) +# Make sure we get postscriptdriver tags - for automatic driver installation +# via PackageKit. +BuildRequires: python3-cups +# needed for defining %%{__python3} macro for prep phase +BuildRequires: python3-devel +# we use sed in spec file to get majorver.minver string, which is used in directory +# structure +BuildRequires: sed + +# the plugin is built only in Fedora, so +# no need gimp devel files for its ui %if 0%{?rhel} <= 8 || 0%{?fedora} BuildRequires: pkgconfig(gimpui-2.0) %endif -BuildRequires: chrpath -# Make sure we get postscriptdriver tags. -BuildRequires: python3-cups - -# autoreconf -BuildRequires: autoconf automake libtool - -# needed for defining %%{__python3} macro for prep phase -BuildRequires: python3-devel ## NOTE ## # The README file in this package contains suggestions from upstream @@ -170,7 +194,8 @@ mkdir -p %{buildroot}%{_sbindir} rm -rf %{buildroot}%{_datadir}/gutenprint/doc rm -f %{buildroot}%{_datadir}/foomatic/kitload.log -rm -rf %{buildroot}%{_libdir}/gutenprint/5.2/modules/*.la + +rm -rf %{buildroot}%{_libdir}/gutenprint/%{majminver}/modules/*.la rm -f %{buildroot}%{_sysconfdir}/cups/command.types %find_lang %{name} @@ -184,7 +209,7 @@ cat %{name}-po.lang >>%{name}.lang # Fix up rpath. If you can find a way to do this without resorting # to chrpath, please let me know! for file in \ - %{buildroot}%{_sbindir}/cups-genppd.5.3 \ + %{buildroot}%{_sbindir}/cups-genppd.%{majminver} \ %if 0%{?rhel} <= 8 || 0%{?fedora} %{buildroot}%{_libdir}/gimp/*/plug-ins/* \ %endif @@ -261,6 +286,9 @@ exit 0 %{_mandir}/man8/cups-genppd*8*.gz %changelog +* Tue Jan 11 2022 Zdenek Dohnal - 5.3.4-6 +- remove the static libraries which were shipped by mistake + * Mon Nov 22 2021 Zdenek Dohnal - 5.3.4-5 - 2025107 - cups-genppdupdate needs python3-chardet