rpms/gnustep-make/EL-6 gnustep-make.spec, 1.15, 1.16 sources, 1.6, 1.7 gnustep-make-2.2.0-addgsprefix.patch, 1.1, NONE gnustep-make-2.2.0-fix-rename-note.patch, 1.1, NONE

[Jochen Schmitt]

Author: s4504kr

Update of /cvs/pkgs/rpms/gnustep-make/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv30613

Modified Files:
	gnustep-make.spec sources 
Removed Files:
	gnustep-make-2.2.0-addgsprefix.patch 
	gnustep-make-2.2.0-fix-rename-note.patch 
Log Message:
New upstream release


Index: gnustep-make.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnustep-make/EL-6/gnustep-make.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- gnustep-make.spec	13 Sep 2009 23:02:09 -0000	1.15
+++ gnustep-make.spec	11 Jul 2010 18:00:11 -0000	1.16
@@ -1,8 +1,8 @@
 %global debug_package %{nil}
 
 Name:           gnustep-make
-Version:        2.2.0
-Release:        3%{?dist}
+Version:        2.4.0
+Release:        1%{?dist}
 Summary:        GNUstep makefile package
 
 Group:          Development/Tools
@@ -10,10 +10,6 @@ License:        GPLv3+
 URL:            http://www.gnustep.org/
 Source0:        ftp://ftp.gnustep.org/pub/gnustep/core/%{name}-%{version}.tar.gz
 
-# https://savannah.gnu.org/bugs/index.php?27433
-Patch0:         %{name}-2.2.0-addgsprefix.patch
-# https://savannah.gnu.org/bugs/index.php?27432
-Patch1:         %{name}-2.2.0-fix-rename-note.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildConflicts: gnustep-make
@@ -60,8 +56,6 @@ This package contains documentation for 
 
 %prep
 %setup -q
-%patch0 -p1 -b .addgsprefix
-%patch1 -p1 -b .fix-release-note
 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
@@ -72,16 +66,9 @@ sed -i "s|/lib$|/%{_lib}|g" FilesystemLa
 sed -i "s|=/share/GNUstep/Makefiles|=/%{_lib}/GNUstep/Makefiles|" \
     FilesystemLayouts/fhs-system
 
-# Rename overly-generic .info files
-for i in faq filesystem machines userfaq; do
-    mv Documentation/{$i,gnustep-$i}.texi
-done
-
-
 %build
 %configure --with-layout=fhs-system --enable-flattened
-make
-
+make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
@@ -94,13 +81,11 @@ make -C Documentation install GNUSTEP_MA
 for i in Applications WebApplications; do
     mkdir -p %{buildroot}%{_prefix}{,/local}/lib{,64}/GNUstep/$i
 done
-mkdir -p %{buildroot}%{_prefix}/local/share/GNUstep/Documentation
-
+mkdir -p %{buildroot}%{_prefix}{,/local}/share/GNUstep/Documentation/Developer
 
 %clean
 rm -rf %{buildroot}
 
-
 %post
 /sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
 
@@ -109,7 +94,6 @@ if [ $1 = 0 ] ; then
   /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
 fi
 
-
 %files
 %defattr(-,root,root,-)
 %doc ANNOUNCE COPYING FAQ NEWS README
@@ -136,8 +120,10 @@ fi
 %dir %{_prefix}/local/lib64/GNUstep/WebApplications
 %dir %{_datadir}/GNUstep
 %dir %{_datadir}/GNUstep/Documentation
+%dir %{_datadir}/GNUstep/Documentation/Developer
 %dir %{_prefix}/local/share/GNUstep
 %dir %{_prefix}/local/share/GNUstep/Documentation
+%dir %{_prefix}/local/share/GNUstep/Documentation/Developer
 
 
 %files doc
@@ -147,6 +133,12 @@ fi
 
 
 %changelog
+* Mon Jul  5 2010 Jochen Schmitt <Jochen herr-schmitt de> - 2.4.0-1
+- New upstream release
+
+* Sun May  9 2010 Michel Salim <salimma at fedoraproject.org> - 2.2.0-4
+- Add Documentation/Developer directories to -filesystem (bug #585721)
+
 * Sun Sep 13 2009 Michel Salim <salimma at fedoraproject.org> - 2.2.0-3
 - Package now BuildConflicts: itself (bz#473342)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnustep-make/EL-6/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	13 Sep 2009 22:34:03 -0000	1.6
+++ sources	11 Jul 2010 18:00:11 -0000	1.7
@@ -1 +1 @@
-3d2d06d3313432fc82e6b09c49fb7f8a  gnustep-make-2.2.0.tar.gz
+bc2138e6256665e55b00fb0ffac766f1  gnustep-make-2.4.0.tar.gz


--- gnustep-make-2.2.0-addgsprefix.patch DELETED ---


--- gnustep-make-2.2.0-fix-rename-note.patch DELETED ---