From 5bb34feb5dad2ce2d355abec108af24f27f4a79a Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: May 08 2013 11:46:07 +0000 Subject: Fix up patch to fix both g-ir-scanner calls --- diff --git a/0001-Do-not-use-fPIE-when-calling-g-ir-scanner.patch b/0001-Do-not-use-fPIE-when-calling-g-ir-scanner.patch index aa63fb6..29b484f 100644 --- a/0001-Do-not-use-fPIE-when-calling-g-ir-scanner.patch +++ b/0001-Do-not-use-fPIE-when-calling-g-ir-scanner.patch @@ -40,3 +40,31 @@ index f474264..872ed00 100644 -- 1.8.2.1 +diff --git a/src/Makefile.am b/src/Makefile.am +index 2ae56a2..cc2c009 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -18,7 +18,6 @@ PK_GLIB2_LIBS = $(top_builddir)/lib/packagekit-glib2/libpackagekit-glib2.la \ + $(NULL) + + AM_CPPFLAGS = \ +- $(PIE_CFLAGS) \ + $(GIO_CFLAGS) \ + $(GLIB_CFLAGS) \ + $(SQLITE_CFLAGS) \ +@@ -160,6 +159,7 @@ packagekitd_LDFLAGS = \ + $(RELRO_LDFLAGS) + + packagekitd_CFLAGS = \ ++ $(PIE_CFLAGS) \ + $(WARNINGFLAGS_C) \ + $(NULL) + +@@ -259,6 +259,7 @@ libpkplugins_la_LIBADD = \ + $(NULL) + + libpkplugins_la_CFLAGS = \ ++ $(PIE_CFLAGS) \ + $(WARNINGFLAGS_C) \ + $(NULL) + diff --git a/PackageKit.spec b/PackageKit.spec index 48360e0..11f0442 100644 --- a/PackageKit.spec +++ b/PackageKit.spec @@ -248,6 +248,7 @@ user to restart the computer or remove and re-insert the device. NOCONFIGURE=1 ./autogen.sh %build +automake %configure \ --disable-static \ --enable-yum \