make: Update to 4.2.1

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

diff --git a/pakfire/pakfire.nm b/pakfire/pakfire.nm
index 3fb99bfa535621dcab78c9f1a5bef0dbbbe2687b..b16f0791807c7d98f09011ff1416417118c97cdc 100644 (file)
--- a/pakfire/pakfire.nm
+++ b/pakfire/pakfire.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = pakfire
-version    = 0.9.26
+version    = 0.9.27
 release    = 2
 
 maintainer = Michael Tremer <michael.tremer@ipfire.org>
@@ -24,23 +24,16 @@ build
        requires
                autoconf
                automake
-               beecrypt-devel
-               elfutils-devel
                gettext-devel
                intltool
                libcap-devel
                libsolv-devel >= 0.0.0-4
-               popt-devel
                python-devel
                systemd-devel
                systemd-units
                xz-devel
        end
 
-       # libgomp was broken in earlier releases.
-       requires += gcc >= 4.6.2-4
-       requires += beecrypt >= 4.2.1-2
-
        prepare_cmds
                # Generate the build system, if this was not a release
                # tarball.
@@ -55,6 +48,11 @@ build
                # Remove all example repository definitions.
                # Those will be solely provided by system-release.
                rm -rfv %{BUILDROOT}%{sysconfdir}/pakfire/repos/*
+
+               mkdir -pv %{BUILDROOT}%{datadir}/pakfire
+               for i in $(find %{datadir}/automake-* -name config.guess -or -name config.sub); do
+                       cp -vf ${i} %{BUILDROOT}%{datadir}/pakfire/
+               done
        end
 end
 
@@ -90,6 +88,7 @@ packages
                requires
                        # For --rpm-requires.
                        bash >= 4.2-7
+                       debugedit
 
                        %{name} = %{thisver}
                        quality-agent = %{thisver}
@@ -104,6 +103,9 @@ packages
                        systemd-devel < 38
                end
 
+               # Requires GCC 4.9 or later for -fstack-protector-strong
+               conflicts += gcc < 4.9
+
                configfiles
                        %{sysconfdir}/pakfire/builder.conf
                        %{sysconfdir}/pakfire/distros