lvm2: Do not ship /run and it's content

[ipfire-3.x.git] / cups / cups.nm

diff --git a/cups/cups.nm b/cups/cups.nm
index 3a0478a7762098b2e2dcc51be60dd70455ebfb03..113819ee2b0920e0066071108af0b121bcaa5cd1 100644 (file)
--- a/cups/cups.nm
+++ b/cups/cups.nm
@@ -4,29 +4,29 @@
 ###############################################################################
 
 name       = cups
-version    = 2.2.2
-release    = 1
+version    = 2.3.6
+release    = 3
 
 groups     = Applications/Printing
-url        = http://cups.org/software.php
+url        = https://cups.org/software.php
 license    = GPLv2+
-summary    = The common UNIX printing system.
+summary    = The common UNIX printing system
 
 description
        CUPS is the standards-based, open source printing system developed
        by Apple Inc. for Mac OS(R) X and other UNIX(R)-like operating systems.
 end
 
-source_dl  = https://github.com/apple/cups/releases/download/v%{version}/
+source_dl  = https://github.com/apple/cups/archive/refs/tags/v%{version}.tar.gz#/
 sources    = %{thisapp}-source.tar.gz
 
 build
        requires
-               audit-devel
                autoconf
                automake
                avahi-devel
                cyrus-sasl-devel
+               dbus-devel
                gcc-c++
                gnutls-devel
                libacl-devel
@@ -37,62 +37,39 @@ build
                libtiff-devel
                libusb-devel
                openldap-devel
-               openssl-devel
                pam-devel
                systemd-devel
                zlib-devel
        end
 
-       CFLAGS += -DLDAP_DEPRECATED=1
-
        configure_options += \
                --localedir=%{datadir}/locale \
                --with-cupsd-file-perm=0755 \
                --with-log-file-perm=0600 \
                --with-docdir=%{datadir}/%{name}/www \
                --with-dbusdir=%{sysconfdir}/dbus-1 \
-               --enable-pie \
+               --enable-debug \
                --enable-relro \
                --enable-avahi \
-               --enable-lspp \
                --enable-threads \
                --enable-gnutls \
                --enable-webif \
                --with-xinetd=no
 
-       prepare_cmds
-               aclocal -I config-scripts
-               autoconf -I config-scripts
-       end
-
-       install
-               make install BUILDROOT=%{BUILDROOT}
-
-               # Remove sysvinit scripts
-               rm -vfr %{BUILDROOT}/etc/init.d/cups %{BUILDROOT}/etc/rc*.d
+       make_install_targets += \
+               BUILDROOT=%{BUILDROOT}
 
+       install_cmds
                # Install default config file.
                mkdir -pv %{BUILDROOT}/etc/cups
                cp -vf %{DIR_APP}/conf/cupsd.conf %{BUILDROOT}/etc/cups/
 
-               # Rename systemd service files.
-               mv %{BUILDROOT}%{unitdir}/org.cups.cupsd.path \
-                       %{BUILDROOT}%{unitdir}/cups.path
-               mv %{BUILDROOT}%{unitdir}/org.cups.cupsd.service \
-                       %{BUILDROOT}%{unitdir}/cups.service
-               mv %{BUILDROOT}%{unitdir}/org.cups.cupsd.socket \
-                       %{BUILDROOT}%{unitdir}/cups.socket
-               mv %{BUILDROOT}%{unitdir}/org.cups.cups-lpd.socket \
-                       %{BUILDROOT}%{unitdir}/cups-lpd.socket
-               mv %{BUILDROOT}%{unitdir}/org.cups.cups-lpd@.service \
-                       %{BUILDROOT}%{unitdir}/cups-lpd@.service
-
-               sed -i -e "s,org.cups.cupsd,cups,g" \
-                       %{BUILDROOT}%{unitdir}/cups.service
-
-               # Fix permissions
-               chown root:lp %{BUILDROOT}%{localstatedir}/run/cups
-               chmod 0755 %{BUILDROOT}%{localstatedir}/run/cups
+               # Fix file permissions in /usr/include
+               find %{BUILDROOT}%{includedir} -type f -iname "*.h" \
+                       -exec chmod 644 {} \;
+
+               # Drop /var/run
+               rm -rvf %{BUILDROOT}%{localstatedir}/run
        end
 end