From cf1f92507a859eb992dc64674b941de5f35cb10f Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Fri, 5 Jan 2024 21:35:04 +0100
Subject: [PATCH] update to 2.4.0 [release 2.4.0-1mamba;Sun Dec 26 2021]

---
 cups.spec | 57 ++++++++++++++++++++++++-------------------------------
 1 file changed, 25 insertions(+), 32 deletions(-)

diff --git a/cups.spec b/cups.spec
index d1c3796..91098d1 100644
--- a/cups.spec
+++ b/cups.spec
@@ -6,7 +6,7 @@
 %define        libname libcups
 
 Name:          cups
-Version:       2.3.3
+Version:       2.4.0
 Release:       1mamba
 Summary:       Common UNIX Printing System
 Group:         System/Spooling
@@ -14,8 +14,8 @@ Vendor:        openmamba
 Distribution:  openmamba
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
 URL:           http://www.cups.org
-Source0:       https://github.com/apple/cups/releases/download/v%{version}/cups-%{version}-source.tar.gz
-#Source0:       http://www.cups.org/software/%{version}/cups-%{version}-source.tar.bz2
+Source0:       https://github.com/OpenPrinting/cups.git/v%{version}/cups-%{version}.tar.bz2
+#Source0:       https://github.com/apple/cups/releases/download/v%{version}/cups-%{version}-source.tar.gz
 Source1:       cups-pamd
 Source2:       cups-initscript
 Source3:       cups.service
@@ -34,10 +34,8 @@ BuildRequires: glibc-devel
 BuildRequires: libacl-devel
 BuildRequires: libavahi-devel
 BuildRequires: libdbus-devel
-BuildRequires: libe2fs-devel
 BuildRequires: libgcc
 BuildRequires: libgnutls-devel
-BuildRequires: libkrb5-devel
 BuildRequires: libpam-devel
 BuildRequires: libstdc++6-devel
 BuildRequires: libsystemd-devel
@@ -50,7 +48,6 @@ Requires(post):%{libname} = %{version}-%{release}
 Requires:      cups-filters
 Requires:      colord
 %systemd_requires
-BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 
 %description
 The Common UNIX Printing System provides a portable printing layer for UNIX operating systems.
@@ -79,14 +76,11 @@ It is based on the "Internet Printing Protocol" and provides complete printing s
 
 %prep
 %setup -q
-#%patch0 -p1
-%patch1 -p1
-#%patch2 -p0
-%patch3 -p1
-#%patch4 -p1
+#%patch1 -p1
+#%patch3 -p1
+autoconf
 
 %build
-autoconf
 %configure \
    --enable-ssl \
    --enable-static \
@@ -163,8 +157,8 @@ chmod 755 %{buildroot}%{_libdir}/*.a
 /usr/sbin/groupadd lpadmin -g %{lpadmin_gid} &>/dev/null
 /usr/sbin/useradd lpadmin -c "Cups printing daemon" -d /dev/null \
    -s /bin/false -u %{lpadmin_uid} -g %{lpadmin_gid} &>/dev/null
-%systemd_pre org.cups.cupsd
-%systemd_pre org.cups.cups-lpd.socket
+%systemd_pre cups
+%systemd_pre cups-lpd.socket
 exit 0
 
 %post
@@ -177,18 +171,18 @@ if [ $1 -gt 1 ]; then
          sed -i "s|ErrorPolicy stop-printer|ErrorPolicy retry-job|" %{_sysconfdir}/cups/printers.conf
    fi
 fi
-%systemd_post org.cups.cupsd
-%systemd_post org.cups.cups-lpd.socket
+%systemd_post cups
+%systemd_post cups-lpd.socket
 if [ $1 -ge 1 ]; then
    systemctl -q daemon-reload
-   systemctl -q enable org.cups.cupsd
+   systemctl -q enable cups
 fi
 :
 
 %preun
 # erase
-%systemd_preun org.cups.cups-lpd.socket
-%systemd_preun org.cups.cupsd
+%systemd_preun cups-lpd.socket
+%systemd_preun cups
 if [ $1 -eq 0 ]; then
    /usr/sbin/groupdel lp &>/dev/null
    /usr/sbin/userdel lp &>/dev/null
@@ -199,8 +193,8 @@ fi
 :
 
 %postun
-%systemd_postun_with_restart org.cups.cupsd
-%systemd_postun_with_restart org.cups.cups-lpd
+%systemd_postun_with_restart cups
+%systemd_postun_with_restart cups-lpd
 :
 
 %posttrans
@@ -253,11 +247,11 @@ fi
 %{_sbindir}/lpmove
 #%{_sbindir}/reject
 %{_presetdir}/50-cups.preset
-%{_unitdir}/org.cups.cupsd.path
-%{_unitdir}/org.cups.cupsd.service
-%{_unitdir}/org.cups.cupsd.socket
-%{_unitdir}/org.cups.cups-lpd.socket
-%{_unitdir}/org.cups.cups-lpd@.service
+%{_unitdir}/cups.path
+%{_unitdir}/cups.service
+%{_unitdir}/cups.socket
+%{_unitdir}/cups-lpd.socket
+%{_unitdir}/cups-lpd@.service
 %{_datadir}/applications/cups.desktop
 %{_datadir}/icons/hicolor/*/apps/cups.png
 %dir %{_datadir}/cups
@@ -277,6 +271,7 @@ fi
 %{_mandir}/man8/*
 %dir %{_datadir}/doc/cups
 %{_datadir}/doc/cups/*
+%lang(da) %{_datadir}/locale/da/cups_da.po
 %lang(en) %{_datadir}/locale/en/cups_en.po
 %lang(pt_BR) %{_datadir}/locale/pt_BR/cups_pt_BR.po
 %lang(zh_CN) %{_datadir}/locale/zh_CN/cups_zh_CN.po
@@ -294,17 +289,15 @@ fi
 %{_includedir}/cups/*.h
 %{_libdir}/libcups.a
 %{_libdir}/libcups.so
-#%{_libdir}/libcupscgi.a
-#%{_libdir}/libcupscgi.so
 %{_libdir}/libcupsimage.a
 %{_libdir}/libcupsimage.so
-#%{_libdir}/libcupsmime.a
-#%{_libdir}/libcupsmime.so
-#%{_libdir}/libcupsppdc.a
-#%{_libdir}/libcupsppdc.so
+%{_prefix}/lib/pkgconfig/cups.pc
 #%doc CHANGES.txt README.txt
 
 %changelog
+* Sun Dec 26 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 2.4.0-1mamba
+- update to 2.4.0
+
 * Tue Apr 28 2020 Automatic Build System <autodist@mambasoft.it> 2.3.3-1mamba
 - automatic version update by autodist