diff --git a/.gitignore b/.gitignore index e1534a0..57c06c2 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,5 @@ /apt-cacher-ng_3.1.orig.tar.xz /apt-cacher-ng_3.7.4-1.debian.tar.xz /apt-cacher-ng_3.7.4.orig.tar.xz +/apt-cacher-ng_3.6.4-1.debian.tar.xz +/apt-cacher-ng_3.6.4.orig.tar.xz diff --git a/apt-cacher-ng.spec b/apt-cacher-ng.spec index 07c59cd..824c658 100644 --- a/apt-cacher-ng.spec +++ b/apt-cacher-ng.spec @@ -2,8 +2,8 @@ %global debian_release 1 Name: apt-cacher-ng -Version: 3.7.4 -Release: 5%{?dist} +Version: 3.6.4 +Release: 1%{?dist} Summary: Caching proxy for package files from Debian License: BSD-4-Clause @@ -26,7 +26,6 @@ BuildRequires: boost-devel BuildRequires: systemd BuildRequires: systemd-devel BuildRequires: libevent-devel -BuildRequires: c-ares-devel BuildRequires: perl-generators Requires(post): systemd @@ -129,6 +128,10 @@ chown -R %{name}:%{name} /run/%{name}/ %{_mandir}/man8/* %changelog +* Tue Jan 24 2023 Alexandre Detiste - 3.6.4-1 +- The C-Ares lib on RHEL8 does not allow us to build the latest A-C-NG + we build instead a previous release + * Tue Jan 24 2023 Alexandre Detiste - 3.7.4-5 - Fix clean install without needing a reboot (upgrade was already OK) diff --git a/sources b/sources index 7b34402..903747d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (apt-cacher-ng_3.7.4-1.debian.tar.xz) = 4243f67c10250003fad2d4a99647d3e8c6d538e5d8bcb2c3714b409a3e24836ce67953a7c00594a7615ef71e637f316c738d86e330f2d476e0187d2e955b4ac5 -SHA512 (apt-cacher-ng_3.7.4.orig.tar.xz) = b7058b579f5760702416f40f064862a03bf8d61209a667e3f9eba3f6ea25bea3cc94c45b06679c0a31d680e60a02fe54d1f84f25b5661cd0293af09486256203 +SHA512 (apt-cacher-ng_3.6.4-1.debian.tar.xz) = 90743cabcff76f4618049976a11182e3172aeb5323e13d7181e56877e33db2fec2c9747b9d5bc058085a317b2ef81f6d96693e242dd4f59949ba457e40573a92 +SHA512 (apt-cacher-ng_3.6.4.orig.tar.xz) = ed24be55f69dc27c851b2d93674778994d107e577066f6841b91af8fc1b163c6bb252165918b5a0d03a72c181639bd44b452e24e2ecb2a450a509e9654015b43 diff --git a/supacng.patch b/supacng.patch index 963c72a..5be294b 100644 --- a/supacng.patch +++ b/supacng.patch @@ -2,15 +2,15 @@ # Purpose: versioning the shared library to comply with Fedora Policy # https://bugzilla.redhat.com/show_bug.cgi?id=2157646 # Upstreamed: no -diff -uNr apt-cacher-ng-3.7.4.orig/src/CMakeLists.txt apt-cacher-ng-3.7.4/src/CMakeLists.txt ---- apt-cacher-ng-3.7.4.orig/src/CMakeLists.txt 2022-12-28 15:31:55.893118781 -0600 -+++ apt-cacher-ng-3.7.4/src/CMakeLists.txt 2022-12-28 15:32:49.351832421 -0600 +diff -uNr apt-cacher-ng-3.6.4.orig/source/CMakeLists.txt apt-cacher-ng-3.6.4/source/CMakeLists.txt +--- apt-cacher-ng-3.6.4.orig/source/CMakeLists.txt 2022-12-28 15:31:55.893118781 -0600 ++++ apt-cacher-ng-3.6.4/source/CMakeLists.txt 2022-12-28 15:32:49.351832421 -0600 @@ -20,7 +20,7 @@ add_definitions(-DACNG_CORE_IN_SO) endif() -SET_TARGET_PROPERTIES(supacng PROPERTIES COMPILE_FLAGS "${ACNG_COMPFLAGS} ${ACNG_CXXFLAGS} ${CFLAGS_DAEMON} ${CFLAGS_PTHREAD}") +SET_TARGET_PROPERTIES(supacng PROPERTIES VERSION ${ACVERSION} SOVERSION 1 COMPILE_FLAGS "${ACNG_COMPFLAGS} ${ACNG_CXXFLAGS} ${CFLAGS_DAEMON} ${CFLAGS_PTHREAD}") + TARGET_LINK_LIBRARIES(supacng ${BaseNetworkLibs} ${ServerLibs} ${CompLibs} ${SSL_LIB_LIST} ${LDFLAGS_DAEMON} ${CMAKE_THREAD_LIBS_INIT} ${EXTRA_LIBS_ACNG}) + INSTALL(TARGETS supacng LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) - option(ENABLE_PCH "Enable use of precompiled headers for faster builds" off) - if(ENABLE_PCH)