diff --git a/.drone.jsonnet b/.drone.jsonnet index e9a6d4b..22c0db3 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -24,7 +24,7 @@ local DistVersion(version='7') = { image: 'thegeeklab/rpmbuild:' + version, commands: [ 'source /drone/src/.drone.env', - 'rm -rf /etc/xinetd.d/ && rpmbuild -ba --without libusb1 --define "version_ $${CUPS_VERSION##v}" cups.spec', + 'rpmbuild -ba --without libusb1 --define "version_ $${CUPS_VERSION##v}" cups.spec', 'ls -l /drone/src/dist/RPMS/x86_64/', ], }; @@ -38,7 +38,7 @@ local PipelineBuildPackage = { arch: 'amd64', }, steps: [ - // DistVersion(version='7'), + DistVersion(version='7'), DistVersion(version='8'), { name: 'checksum', diff --git a/.drone.yml b/.drone.yml index 4d43fcf..e11c0d0 100644 --- a/.drone.yml +++ b/.drone.yml @@ -31,7 +31,7 @@ steps: image: thegeeklab/rpmbuild:8 commands: - source /drone/src/.drone.env - - rm -rf /etc/xinetd.d/ && rpmbuild -ba --without libusb1 --define "version_ $${CUPS_VERSION##v}" cups.spec + - rpmbuild -ba --without libusb1 --define "version_ $${CUPS_VERSION##v}" cups.spec - ls -l /drone/src/dist/RPMS/x86_64/ - name: checksum @@ -115,6 +115,6 @@ depends_on: --- kind: signature -hmac: 6cea4ffb42a9a10fdbbb53d535276a88e8e5499fc6d2cf55af17b038aa9d50cb +hmac: 5a50892d1993ab7fdfbab90f5b66a3f665b9d9e9ffa058642c2b3970368f02f3 ... diff --git a/cups.spec b/cups.spec index 4f41336..e343160 100644 --- a/cups.spec +++ b/cups.spec @@ -117,7 +117,13 @@ This package provides LPD client support. %build CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_OPT_FLAGS" \ - ./configure %{_dbus} %{_dnssd} %{_libusb1} %{_static} %{_systemd} + ./configure %{_dbus} %{_dnssd} %{_libusb1} %{_static} %{_systemd} \ + --enable-debug \ + --with-exe-file-perm=0755 \ + --with-cupsd-file-perm=0755 \ + --with-log-file-perm=0600 \ + --with-xinetd=no + # If we got this far, all prerequisite libraries must be here. make