[gnustep-make] Fix issue with using DESTDIr in Framework.make (#1005328)

Jochen Schmitt s4504kr at fedoraproject.org
Fri Sep 6 19:05:41 UTC 2013


commit 584a16bdcbeae67293c55c714c6fc10f7708e7ba
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date:   Fri Sep 6 21:05:25 2013 +0200

    Fix issue with using DESTDIr in Framework.make (#1005328)

 gnustep-make-2.6.5-framework.patch |   12 ++++++++++++
 gnustep-make.spec                  |   10 +++++++++-
 2 files changed, 21 insertions(+), 1 deletions(-)
---
diff --git a/gnustep-make-2.6.5-framework.patch b/gnustep-make-2.6.5-framework.patch
new file mode 100644
index 0000000..516b56c
--- /dev/null
+++ b/gnustep-make-2.6.5-framework.patch
@@ -0,0 +1,12 @@
+diff -rupN gnustep-make-2.6.5/Instance/framework.make gnustep-make-2.6.5-new/Instance/framework.make
+--- gnustep-make-2.6.5/Instance/framework.make	2013-02-22 10:37:00.000000000 +0100
++++ gnustep-make-2.6.5-new/Instance/framework.make	2013-09-06 15:50:02.517185802 +0200
+@@ -493,7 +493,7 @@ $(DUMMY_FRAMEWORK_FILE): $(DERIVED_SOURC
+ 	echo "@end" >> $@; \
+ 	echo "@implementation $(DUMMY_FRAMEWORK)" >> $@; \
+ 	echo "+ (NSString *)frameworkEnv { return nil; }" >> $@; \
+-	echo "+ (NSString *)frameworkPath { return @\"$(FRAMEWORK_INSTALL_DIR)\"; }" >> $@; \
++	echo "+ (NSString *)frameworkPath { return @\"$(GNUSTEP_$(GNUSTEP_INSTALLATION_DOMAIN)_FRAMEWORKS)\"; }" >> $@; \
+ 	echo "+ (NSString *)frameworkVersion { return @\"$(CURRENT_VERSION_NAME)\"; }" >> $@; \
+ 	echo "static NSString *allClasses[] = {$$classlist};" >> $@; \
+ 	echo "+ (NSString *const*)frameworkClasses { return allClasses; }" >> $@;\
diff --git a/gnustep-make.spec b/gnustep-make.spec
index 7781cab..93f86f4 100644
--- a/gnustep-make.spec
+++ b/gnustep-make.spec
@@ -2,7 +2,7 @@
 
 Name:           gnustep-make
 Version:        2.6.5
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        GNUstep makefile package
 
 Group:          Development/Tools
@@ -13,6 +13,9 @@ Source0:        ftp://ftp.gnustep.org/pub/gnustep/core/%{name}-%{version}.tar.gz
 # Taken from git://fedorahosted.org/git/gnustep-rpm-macros.git
 Source1:	macros.gnustep
 
+# Patch to fix #1005328 (Using Framework.mate with DESTPATH)
+Patch1:         gnustep-make-2.6.5-framework.patch
+
 BuildConflicts: gnustep-make
 BuildRequires:  automake autoconf
 BuildRequires:  gcc-objc
@@ -58,6 +61,8 @@ This package contains documentation for %{name}.
 
 %prep
 %setup -q
+%patch1 -p1 -b .fmwork
+
 sed -i "s|/lib/|/%{_lib}/|g" FilesystemLayouts/fhs-system
 sed -i "s|/lib$|/%{_lib}|g" FilesystemLayouts/fhs-system
 sed -i "s|/lib/|/%{_lib}/|g" FilesystemLayouts/fhs
@@ -122,6 +127,9 @@ fi
 
 
 %changelog
+* Fri Sep  6 2013 Jochen Schmitt <Jochen herr-schmitt de> - 2.6.5-4
+- Fix issue with using DESTDIr in Framework.make (#1005328)
+
 * Wed Aug 21 2013 Jochen Schmitt <Jochen herr-schmitt de> - 2.6.5-3
 - Change macros in macros.gnustep
 


More information about the scm-commits mailing list