rpms/gnustep-make/devel gnustep-make-2.2.0-addgsprefix.patch, NONE, 1.1 gnustep-make-2.2.0-fix-rename-note.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 gnustep-make.spec, 1.13, 1.14 sources, 1.5, 1.6

Sun Sep 13 22:34:03 UTC 2009

Author: salimma

Update of /cvs/pkgs/rpms/gnustep-make/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16665/devel

Modified Files:
	.cvsignore gnustep-make.spec sources 
Added Files:
	gnustep-make-2.2.0-addgsprefix.patch 
	gnustep-make-2.2.0-fix-rename-note.patch 
Log Message:
* Sun Sep 13 2009 Michel Salim <salimma at fedoraproject.org> - 2.2.0-2
- Rename overly-generic info files
- Fix all references to lib -> %%{_lib}
- Add more directories to gnustep-filesystem

* Sat Sep 12 2009 Michel Salim <salimma at fedoraproject.org> - 2.2.0-1
- Update to 2.2.0
- Replace perl scripts with sed equivalents; dropping BR



gnustep-make-2.2.0-addgsprefix.patch:
 GNUmakefile        |   31 ++++++++++++++++---------------
 gnustep-howto.texi |    2 +-
 2 files changed, 17 insertions(+), 16 deletions(-)

--- NEW FILE gnustep-make-2.2.0-addgsprefix.patch ---
--- gnustep-make-2.2.0/Documentation/GNUmakefile.addgsprefix	2008-06-11 12:28:47.000000000 -0400
+++ gnustep-make-2.2.0/Documentation/GNUmakefile	2009-09-13 14:32:11.067200455 -0400
@@ -71,7 +71,8 @@
 # info 'faq' would probably return our faq before anything else
 # because the INFOPATH is used before built-in paths, but it's
 # still confusing to have conflicts.
-DOCUMENT_NAME = gnustep-howto faq filesystem internals machines gnustep-make userfaq
+DOCUMENT_NAME = gnustep-howto gnustep-faq gnustep-filesystem internals \
+	gnustep-machines gnustep-make gnustep-userfaq
 
 # The text documents to be generated
 DOCUMENT_TEXT_NAME = FAQ INSTALL README NEWS RELEASENOTES GNUstep-HOWTO ANNOUNCE
@@ -86,30 +87,30 @@
 GNUstep-HOWTO_DOC_INSTALL_DIR = User/GNUstep/
 
 FAQ_TEXI_FILES = version.texi
-FAQ_TEXT_MAIN = faq.texi
+FAQ_TEXT_MAIN = gnustep-faq.texi
 FAQ_DOC_INSTALL_DIR = User/GNUstep/
 
 gnustep-make_TEXI_FILES = \
 gnustep-make.texi
 gnustep-make_DOC_INSTALL_DIR = Developer/Make/Manual/
 
-faq_TEXI_FILES = \
-faq.texi \
+gnustep-faq_TEXI_FILES = \
+gnustep-faq.texi \
 version.texi
-faq_DOC_INSTALL_DIR = User/GNUstep/
+gnustep-faq_DOC_INSTALL_DIR = User/GNUstep/
 
-userfaq_TEXI_FILES = \
-userfaq.texi \
+gnustep-userfaq_TEXI_FILES = \
+gnustep-userfaq.texi \
 version.texi
-userfaq_DOC_INSTALL_DIR = User/GNUstep/
+gnustep-userfaq_DOC_INSTALL_DIR = User/GNUstep/
 
-filesystem_TEXI_FILES = \
-filesystem.texi
-filesystem_DOC_INSTALL_DIR = User/GNUstep/
-
-machines_TEXI_FILES = \
-machines.texi 
-machines_DOC_INSTALL_DIR = User/GNUstep/
+gnustep-filesystem_TEXI_FILES = \
+gnustep-filesystem.texi
+gnustep-filesystem_DOC_INSTALL_DIR = User/GNUstep/
+
+gnustep-machines_TEXI_FILES = \
+gnustep-machines.texi 
+gnustep-machines_DOC_INSTALL_DIR = User/GNUstep/
 
 gnustep-howto_TEXI_FILES = \
 gnustep-howto.texi \
--- gnustep-make-2.2.0/Documentation/gnustep-howto.texi.addgsprefix	2007-03-17 16:19:11.000000000 -0400
+++ gnustep-make-2.2.0/Documentation/gnustep-howto.texi	2009-09-13 14:33:14.792200412 -0400
@@ -460,7 +460,7 @@
 @node Machine Specific, Source via SVN, Tools and Applications, Top
 @chapter Machine Specific Instructions
 
- at include machines.texi
+ at include gnustep-machines.texi
 
 
 @node Source via SVN,  , Machine Specific, Top

gnustep-make-2.2.0-fix-rename-note.patch:
 releasenotes.texi |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gnustep-make-2.2.0-fix-rename-note.patch ---
--- gnustep-make-2.2.0/Documentation/releasenotes.texi.fix-rename-note	2009-05-09 14:32:29.000000000 -0400
+++ gnustep-make-2.2.0/Documentation/releasenotes.texi	2009-09-13 14:22:43.075450206 -0400
@@ -91,7 +91,7 @@
 different location, use the --with-config-file=PATH option, as in
 --with-config-file=/usr/pkg/etc/GNUstep.conf.
 
- at item gnustep-make.info renamed to make.info
+ at item make.info renamed to gnustep-make.info
 To prevent conflicts with the standard GNU 'make' info documentation,
 the gnustep-make one has been renamed.  Now you can access it as in
 'info gnustep-make' instead of 'info make', avoiding any conflicts and


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnustep-make/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	24 Mar 2009 19:30:01 -0000	1.5
+++ .cvsignore	13 Sep 2009 22:34:02 -0000	1.6
@@ -1 +1 @@
-gnustep-make-2.0.8.tar.gz
+gnustep-make-2.2.0.tar.gz


Index: gnustep-make.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnustep-make/devel/gnustep-make.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- gnustep-make.spec	25 Jul 2009 01:00:07 -0000	1.13
+++ gnustep-make.spec	13 Sep 2009 22:34:02 -0000	1.14
@@ -1,19 +1,26 @@
 %global debug_package %{nil}
-%bcond_without docs
 
-Summary: GNUstep makefile package
-Name: gnustep-make
-Version: 2.0.8
-Release: 3%{?dist}
-License: GPLv3+
-Group: Development/Tools
-URL: http://www.gnustep.org/
-Source: ftp://ftp.gnustep.org/pub/gnustep/core/%{name}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: perl
-%if %{with docs}
-BuildRequires: texinfo-tex, tetex-latex, tetex-dvips, latex2html, texi2html
-%endif
+Name:           gnustep-make
+Version:        2.2.0
+Release:        2%{?dist}
+Summary:        GNUstep makefile package
+
+Group:          Development/Tools
+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
+
+BuildRequires:  texinfo-tex tetex-latex tetex-dvips latex2html texi2html
+Requires:       gnustep-filesystem = %{version}-%{release}
+Requires(post): info
+Requires(preun): info
+
 
 %description
 The makefile package is a simple, powerful and extensible way to write
@@ -22,14 +29,25 @@ project without having to deal with the 
 configuration, building, installation, and packaging.  It also allows
 the user to easily create cross-compiled binaries.
 
-%if %{with docs}
+
+%package -n     gnustep-filesystem
+Summary:        The basic directory layout for GNUstep packages
+Group:          System Environment/Base
+License:        Public Domain
+BuildArch:      noarch
+
+%description -n gnustep-filesystem
+The gnustep-filesystem package contains the basic directory layout for
+GNUstep packages.
+
+
 %package        doc
 Summary:        Documentation for %{name}
 Group:          Documentation
 License:        GPLv3+
+BuildArch:      noarch
 Requires:       %{name} = %{version}-%{release}
 
-
 %description    doc
 The makefile package is a simple, powerful and extensible way to write
 makefiles for a GNUstep-based project.  It allows the user to write a
@@ -38,58 +56,105 @@ configuration, building, installation, a
 the user to easily create cross-compiled binaries.
 
 This package contains documentation for %{name}.
-%endif
 
 %prep
 %setup -q
-perl -pi -e"s,/share/GNUstep/Documentation,`echo %{_defaultdocdir}/%{name}-doc-%{version} | sed -e's,^/usr,,'`," \
-  FilesystemLayouts/fhs-system
+%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
+sed -i "s|/lib$|/%{_lib}|g" FilesystemLayouts/fhs
 # /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
-sed -i -e 's,/local,,' FilesystemLayouts/fhs-system
-sed -i -e 's,=/lib,=/%_lib,' FilesystemLayouts/fhs-system
-perl -pi -e"s,GNUSTEP_MAKEFILES=/share/GNUstep/Makefiles,GNUSTEP_MAKEFILES=`echo %{_libdir} | sed -e's,^/usr,,'`/GNUstep/Makefiles," \
-  FilesystemLayouts/fhs-system
+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
 
+
 %install
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 mkdir -p %{buildroot}%{_defaultdocdir}/%{name}-doc-%{version}
-%if %{with docs}
 make -C Documentation GNUSTEP_MAKEFILES=%{buildroot}%{_libdir}/GNUstep/Makefiles
 make -C Documentation install GNUSTEP_MAKEFILES=%{buildroot}%{_libdir}/GNUstep/Makefiles DESTDIR=%{buildroot}
-%endif
-mkdir -p %{buildroot}%{_defaultdocdir}/%{name}-%{version}
-install -p ANNOUNCE COPYING FAQ NEWS README \
-  %{buildroot}%{_defaultdocdir}/%{name}-%{version}
+
+# create remaining GNUstep directories
+for i in Applications WebApplications; do
+    mkdir -p %{buildroot}%{_prefix}{,/local}/lib{,64}/GNUstep/$i
+done
+mkdir -p %{buildroot}%{_prefix}/local/share/GNUstep/Documentation
+
 
 %clean
 rm -rf %{buildroot}
 
+
+%post
+/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
+
+%preun
+if [ $1 = 0 ] ; then
+  /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
+fi
+
+
 %files
 %defattr(-,root,root,-)
-%doc %{_defaultdocdir}/%{name}-%{version}
-#%{_datadir}/GNUstep
-%{_libdir}/GNUstep
-#%{_libexecdir}/GNUstep
-%dir /etc/GNUstep
-%config(noreplace) /etc/GNUstep/GNUstep.conf
+%doc ANNOUNCE COPYING FAQ NEWS README
+%config(noreplace) %{_sysconfdir}/GNUstep/GNUstep.conf
 %{_bindir}/*
+%{_libdir}/GNUstep/Makefiles
 %{_mandir}/man*/*
-%if %{with docs}
 %{_infodir}/*
-%endif
+
+%files -n gnustep-filesystem
+%defattr(-,root,root,-)
+%dir %{_sysconfdir}/GNUstep
+%dir %{_prefix}/lib/GNUstep
+%dir %{_prefix}/lib64/GNUstep
+%dir %{_prefix}/lib/GNUstep/Applications
+%dir %{_prefix}/lib64/GNUstep/Applications
+%dir %{_prefix}/lib/GNUstep/WebApplications
+%dir %{_prefix}/lib64/GNUstep/WebApplications
+%dir %{_prefix}/local/lib/GNUstep
+%dir %{_prefix}/local/lib/GNUstep/Applications
+%dir %{_prefix}/local/lib/GNUstep/WebApplications
+%dir %{_prefix}/local/lib64/GNUstep
+%dir %{_prefix}/local/lib64/GNUstep/Applications
+%dir %{_prefix}/local/lib64/GNUstep/WebApplications
+%dir %{_datadir}/GNUstep
+%dir %{_datadir}/GNUstep/Documentation
+%dir %{_prefix}/local/share/GNUstep
+%dir %{_prefix}/local/share/GNUstep/Documentation
+
 
 %files doc
 %defattr(-,root,root,-)
 %doc %{_defaultdocdir}/%{name}-doc-%{version}
+%doc %{_datadir}/GNUstep/Documentation/*
+
 
 %changelog
+* Sun Sep 13 2009 Michel Salim <salimma at fedoraproject.org> - 2.2.0-2
+- Rename overly-generic info files
+- Fix all references to lib -> %%{_lib}
+- Add more directories to gnustep-filesystem
+
+* Sat Sep 12 2009 Michel Salim <salimma at fedoraproject.org> - 2.2.0-1
+- Update to 2.2.0
+- Replace perl scripts with sed equivalents; dropping BR
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.8-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnustep-make/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	24 Mar 2009 19:30:01 -0000	1.5
+++ sources	13 Sep 2009 22:34:03 -0000	1.6
@@ -1 +1 @@
-13bd26f135cbc38a94dfb220e9ffd460  gnustep-make-2.0.8.tar.gz
+3d2d06d3313432fc82e6b09c49fb7f8a  gnustep-make-2.2.0.tar.gz


