rpms/gnustep-make/F-7 gnustep-make-2.0.4-fhs-fixes.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 gnustep-make.spec, 1.1, 1.2 sources, 1.2, 1.3

[Axel Thimm (athimm)]

Author: athimm

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

Modified Files:
	.cvsignore gnustep-make.spec sources 
Added Files:
	gnustep-make-2.0.4-fhs-fixes.patch 
Log Message:
Update to 2.0.4.

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

--- NEW FILE gnustep-make-2.0.4-fhs-fixes.patch ---
--- gnustep-make-2.0.4/FilesystemLayouts/fhs-system~	2007-05-25 15:12:35.000000000 +0200
+++ gnustep-make-2.0.4/FilesystemLayouts/fhs-system	2008-02-18 21:06:51.000000000 +0100
@@ -48,9 +48,9 @@
 GNUSTEP_SYSTEM_LIBRARY=/lib/GNUstep
 GNUSTEP_SYSTEM_HEADERS=/include
 GNUSTEP_SYSTEM_LIBRARIES=/lib
-GNUSTEP_SYSTEM_DOC=/share/GNUstep/Documentation
-GNUSTEP_SYSTEM_DOC_MAN=/man
-GNUSTEP_SYSTEM_DOC_INFO=/info
+GNUSTEP_SYSTEM_DOC=/share/doc/GNUstep
+GNUSTEP_SYSTEM_DOC_MAN=/share/man
+GNUSTEP_SYSTEM_DOC_INFO=/share/info
 
 GNUSTEP_NETWORK_APPS=/local/lib/GNUstep/Applications
 GNUSTEP_NETWORK_ADMIN_APPS=/local/lib/GNUstep/Applications
@@ -60,9 +60,9 @@
 GNUSTEP_NETWORK_LIBRARY=/local/lib/GNUstep
 GNUSTEP_NETWORK_HEADERS=/local/include
 GNUSTEP_NETWORK_LIBRARIES=/local/lib
-GNUSTEP_NETWORK_DOC=/local/share/GNUstep/Documentation
-GNUSTEP_NETWORK_DOC_MAN=/local/man
-GNUSTEP_NETWORK_DOC_INFO=/local/info
+GNUSTEP_NETWORK_DOC=/local/share/doc/GNUstep
+GNUSTEP_NETWORK_DOC_MAN=/local/share/man
+GNUSTEP_NETWORK_DOC_INFO=/local/share/info
 
 GNUSTEP_LOCAL_APPS=/local/lib/GNUstep/Applications
 GNUSTEP_LOCAL_ADMIN_APPS=/local/lib/GNUstep/Applications
@@ -72,9 +72,9 @@
 GNUSTEP_LOCAL_LIBRARY=/local/lib/GNUstep
 GNUSTEP_LOCAL_HEADERS=/local/include
 GNUSTEP_LOCAL_LIBRARIES=/local/lib
-GNUSTEP_LOCAL_DOC=/local/share/GNUstep/Documentation
-GNUSTEP_LOCAL_DOC_MAN=/local/man
-GNUSTEP_LOCAL_DOC_INFO=/local/info
+GNUSTEP_LOCAL_DOC=/local/share/doc/GNUstep
+GNUSTEP_LOCAL_DOC_MAN=/local/share/man
+GNUSTEP_LOCAL_DOC_INFO=/local/share/info
 
 GNUSTEP_USER_DIR_APPS=GNUstep/Applications
 GNUSTEP_USER_DIR_ADMIN_APPS=GNUstep/Applications/Admin


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnustep-make/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Sep 2006 22:49:28 -0000	1.2
+++ .cvsignore	23 Feb 2008 10:38:03 -0000	1.3
@@ -1 +1 @@
-gnustep-make-1.12.0.tar.gz
+gnustep-make-2.0.4.tar.gz


Index: gnustep-make.spec
===================================================================
RCS file: /cvs/extras/rpms/gnustep-make/F-7/gnustep-make.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnustep-make.spec	1 Sep 2006 22:49:28 -0000	1.1
+++ gnustep-make.spec	23 Feb 2008 10:38:03 -0000	1.2
@@ -1,15 +1,19 @@
+%bcond_without docs
+
 Summary: GNUstep makefile package
 Name: gnustep-make
-Version: 1.12.0
-Release: 5%{?dist}
+Version: 2.0.4
+Release: 8%{?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-1.12.0-chickenandegg.patch
-Patch1: gnustep-make-1.12.0-fhs_which_lib.patch
+Patch0: gnustep-make-2.0.4-fhs-fixes.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: texinfo, tetex-latex, tetex-dvips
+BuildRequires: perl
+%if %{with docs}
+BuildRequires: texinfo-tex, tetex-latex, tetex-dvips, latex2html, texi2html
+%endif
 
 %description
 The makefile package is a simple, powerful and extensible way to write
@@ -21,50 +25,51 @@
 %prep
 %setup -q
 %patch0 -p1
-# Fix make install into alternative root
-perl -pi -e's,makedir = \@GNUSTEP_MAKEFILES\@,makedir = \$(special_prefix)\@GNUSTEP_MAKEFILES\@,' GNUmakefile.in
-# FHS herculian act (more like Sysphus, but anyway ...)
-%patch1 -p1
-
-myreplace() {
-  grep -rl "$1" . | egrep -v '(ChangeLog|INSTALL|\.texi$|README|FAQ)' | xargs -r echo perl -pi -e"s,$1,$2,g" | sh -x
-}
-
-myreplace /share /share/gnustep
-myreplace Library/Headers include/gnustep
-myreplace Library/Applications bin
-myreplace Library/Makefiles share/gnustep/makefiles
-myreplace /Library /share/gnustep
-myreplace Library/ share/gnustep/
-myreplace /Tools /libexec/gnustep
-myreplace Tools/ libexec/gnustep/
+perl -pi -e"s,/share/doc/GNUstep,`echo %{_defaultdocdir}/%{name}-%{version} | sed -e's,^/usr,,'`," \
+  FilesystemLayouts/fhs-system
 
 %build
-%configure \
-  --with-system-root=%{_prefix} \
-  --with-local-root=/usr/local \
-  --disable-flattened
+%configure --with-layout=fhs-system --disable-flattened
 make
-make -C Documentation
 
 %install
 rm -rf %{buildroot}
-make install special_prefix=%{buildroot}
-make -C Documentation install special_prefix=%{buildroot}
+make install DESTDIR=%{buildroot}
+%if %{with docs}
+make -C Documentation GNUSTEP_MAKEFILES=%{buildroot}%{_datadir}/GNUstep/Makefiles
+make -C Documentation install GNUSTEP_MAKEFILES=%{buildroot}%{_datadir}/GNUstep/Makefiles DESTDIR=%{buildroot}
+%else
+mkdir -p %{buildroot}%{_defaultdocdir}/%{name}-%{version}
+%endif
+install -p ANNOUNCE COPYING FAQ NEWS README \
+  %{buildroot}%{_defaultdocdir}/%{name}-%{version}
 
 %clean
 rm -rf %{buildroot}
 
-
 %files
 %defattr(-,root,root,-)
-%doc ANNOUNCE COPYING FAQ NEWS README
-%{_datadir}/gnustep
-%{_libexecdir}/gnustep
+%{_defaultdocdir}/%{name}-%{version}
+%{_datadir}/GNUstep
+#%{_libexecdir}/GNUstep
 %dir /etc/GNUstep
 %config(noreplace) /etc/GNUstep/GNUstep.conf
+%{_bindir}/*
+%{_mandir}/man*/*
+%if %{with docs}
+%{_infodir}/*
+%endif
 
 %changelog
+* Fri Feb 22 2008 Axel Thimm <Axel.Thimm at ATrpms.net> - 2.0.4-8
+- Rename make.info to avoid clash with GNU make.
+
+* Mon Feb 18 2008 Axel Thimm <Axel.Thimm at ATrpms.net> - 2.0.4-7
+- Update to 2.0.4.
+
+* Mon Feb 12 2007 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.13.0-6
+- Update to 1.13.0.
+
 * Fri Jul 28 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.12.0-5
 - Try to make FHS compliant.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnustep-make/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Sep 2006 22:49:28 -0000	1.2
+++ sources	23 Feb 2008 10:38:03 -0000	1.3
@@ -1 +1 @@
-1883a6387405e51ff4c384fb5cc547a7  gnustep-make-1.12.0.tar.gz
+3aef218e5b17999049256892acca7552  gnustep-make-2.0.4.tar.gz