rpms/gnustep-make/F-8 .cvsignore, 1.3, 1.4 gnustep-make.spec, 1.4, 1.5 sources, 1.3, 1.4 gnustep-make-1.12.0-chickenandegg.patch, 1.1, NONE gnustep-make-1.12.0-fhs_which_lib.patch, 1.1, NONE gnustep-make-2.0.4-fhs-fixes.patch, 1.1, NONE

[Axel Thimm (athimm)]

Author: athimm

Update of /cvs/extras/rpms/gnustep-make/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18395/F-8

Modified Files:
	.cvsignore gnustep-make.spec sources 
Removed Files:
	gnustep-make-1.12.0-chickenandegg.patch 
	gnustep-make-1.12.0-fhs_which_lib.patch 
	gnustep-make-2.0.4-fhs-fixes.patch 
Log Message:
2.0.6 & bug #437551


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnustep-make/F-8/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	23 Feb 2008 10:38:13 -0000	1.3
+++ .cvsignore	6 Aug 2008 11:47:38 -0000	1.4
@@ -1 +1 @@
-gnustep-make-2.0.4.tar.gz
+gnustep-make-2.0.6.tar.gz


Index: gnustep-make.spec
===================================================================
RCS file: /cvs/extras/rpms/gnustep-make/F-8/gnustep-make.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnustep-make.spec	4 Mar 2008 22:15:50 -0000	1.4
+++ gnustep-make.spec	6 Aug 2008 11:47:38 -0000	1.5
@@ -2,13 +2,12 @@
 
 Summary: GNUstep makefile package
 Name: gnustep-make
-Version: 2.0.4
-Release: 9%{?dist}
+Version: 2.0.6
+Release: 11%{?dist}
 License: GPL
 Group: Development/Tools
 URL: http://www.gnustep.org/
 Source0: ftp://ftp.gnustep.org/pub/gnustep/core/%{name}-%{version}.tar.gz
-Patch0: gnustep-make-2.0.4-fhs-fixes.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: perl
 %if %{with docs}
@@ -24,8 +23,12 @@
 
 %prep
 %setup -q
-%patch0 -p1
-perl -pi -e"s,/share/doc/GNUstep,`echo %{_defaultdocdir}/%{name}-%{version} | sed -e's,^/usr,,'`," \
+perl -pi -e"s,/share/GNUstep/Documentation,`echo %{_defaultdocdir}/%{name}-%{version} | sed -e's,^/usr,,'`," \
+  FilesystemLayouts/fhs-system
+# /usr/share/GNUstep/Makefiles/config-noarch.make and
+# /usr/share/GNUstep/Makefiles/ix86/linux-gnu/gnu-gnu-gnu/config.make
+# are spoiling a pure /usr/share install
+perl -pi -e"s,GNUSTEP_MAKEFILES=/share/GNUstep/Makefiles,GNUSTEP_MAKEFILES=`echo %{_libdir} | sed -e's,^/usr,,'`/GNUstep/Makefiles," \
   FilesystemLayouts/fhs-system
 
 %build
@@ -38,7 +41,6 @@
 %if %{with docs}
 make -C Documentation GNUSTEP_MAKEFILES=%{buildroot}%{_datadir}/GNUstep/Makefiles
 make -C Documentation install GNUSTEP_MAKEFILES=%{buildroot}%{_datadir}/GNUstep/Makefiles DESTDIR=%{buildroot}
-mv %{buildroot}%{_infodir}/make.info %{buildroot}%{_infodir}/gnustep-make.info
 %else
 mkdir -p %{buildroot}%{_defaultdocdir}/%{name}-%{version}
 %endif
@@ -51,7 +53,8 @@
 %files
 %defattr(-,root,root,-)
 %{_defaultdocdir}/%{name}-%{version}
-%{_datadir}/GNUstep
+#%{_datadir}/GNUstep
+%{_libdir}/GNUstep
 #%{_libexecdir}/GNUstep
 %dir /etc/GNUstep
 %config(noreplace) /etc/GNUstep/GNUstep.conf
@@ -62,6 +65,10 @@
 %endif
 
 %changelog
+* Fri Jul  4 2008 Axel Thimm <Axel.Thimm at ATrpms.net> - 2.0.6-11
+- Update to 2.0.6.
+- Move %%{_datadir} to %%{_libdir}, see inline comment.
+
 * Tue Mar  4 2008 Axel Thimm <Axel.Thimm at ATrpms.net> - 2.0.4-9
 - Really fix the make.info clash.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnustep-make/F-8/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	23 Feb 2008 10:38:13 -0000	1.3
+++ sources	6 Aug 2008 11:47:38 -0000	1.4
@@ -1 +1 @@
-3aef218e5b17999049256892acca7552  gnustep-make-2.0.4.tar.gz
+58ebb672d10925a2004242eab1aec225  gnustep-make-2.0.6.tar.gz


--- gnustep-make-1.12.0-chickenandegg.patch DELETED ---


--- gnustep-make-1.12.0-fhs_which_lib.patch DELETED ---


--- gnustep-make-2.0.4-fhs-fixes.patch DELETED ---