rpms/gnustep-make/F-10 .cvsignore, 1.4, 1.5 gnustep-make.spec, 1.9, 1.10 sources, 1.4, 1.5

[Michel Alexandre Salim]

Author: salimma

Update of /cvs/pkgs/rpms/gnustep-make/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9793/F-10

Modified Files:
	.cvsignore gnustep-make.spec sources 
Log Message:
* Thu Mar 12 2009 Michel Salim <salimma at fedoraproject.org> - 2.0.8-2
- Put documentation into separate subpackage

* Wed Mar  3 2009 Jochen Schmitt <Jochen herr-schmitt de> - 2.0.8-1
- New upstream release




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnustep-make/F-10/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	6 Aug 2008 11:39:27 -0000	1.4
+++ .cvsignore	24 Mar 2009 19:30:00 -0000	1.5
@@ -1 +1 @@
-gnustep-make-2.0.6.tar.gz
+gnustep-make-2.0.8.tar.gz


Index: gnustep-make.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnustep-make/F-10/gnustep-make.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gnustep-make.spec	26 Aug 2008 22:47:07 -0000	1.9
+++ gnustep-make.spec	24 Mar 2009 19:30:01 -0000	1.10
@@ -1,13 +1,14 @@
+%global debug_package %{nil}
 %bcond_without docs
 
 Summary: GNUstep makefile package
 Name: gnustep-make
-Version: 2.0.6
-Release: 13%{?dist}
+Version: 2.0.8
+Release: 2%{?dist}
 License: GPLv3+
 Group: Development/Tools
 URL: http://www.gnustep.org/
-Source0: ftp://ftp.gnustep.org/pub/gnustep/core/%{name}-%{version}.tar.gz
+Source: ftp://ftp.gnustep.org/pub/gnustep/core/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: perl
 %if %{with docs}
@@ -21,29 +22,49 @@
 configuration, building, installation, and packaging.  It also allows
 the user to easily create cross-compiled binaries.
 
+%if %{with docs}
+%package        doc
+Summary:        Documentation for %{name}
+Group:          Documentation
+License:        GPLv3+
+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
+project without having to deal with the complex issues associated with
+configuration, building, installation, and packaging.  It also allows
+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}-%{version} | sed -e's,^/usr,,'`," \
+perl -pi -e"s,/share/GNUstep/Documentation,`echo %{_defaultdocdir}/%{name}-doc-%{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
+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
 
 %build
-%configure --with-layout=fhs-system --disable-flattened
+%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}
-%else
-mkdir -p %{buildroot}%{_defaultdocdir}/%{name}-%{version}
 %endif
+mkdir -p %{buildroot}%{_defaultdocdir}/%{name}-%{version}
 install -p ANNOUNCE COPYING FAQ NEWS README \
   %{buildroot}%{_defaultdocdir}/%{name}-%{version}
 
@@ -52,7 +73,7 @@
 
 %files
 %defattr(-,root,root,-)
-%{_defaultdocdir}/%{name}-%{version}
+%doc %{_defaultdocdir}/%{name}-%{version}
 #%{_datadir}/GNUstep
 %{_libdir}/GNUstep
 #%{_libexecdir}/GNUstep
@@ -64,7 +85,21 @@
 %{_infodir}/*
 %endif
 
+%files doc
+%defattr(-,root,root,-)
+%doc %{_defaultdocdir}/%{name}-doc-%{version}
+
 %changelog
+* Thu Mar 12 2009 Michel Salim <salimma at fedoraproject.org> - 2.0.8-2
+- Put documentation into separate subpackage
+
+* Wed Mar  3 2009 Jochen Schmitt <Jochen herr-schmitt de> - 2.0.8-1
+- New upstream release
+
+* Wed Dec 10 2008 Jochen Schmitt <Jochen herr-schmitt de> - 2.0.6-14
+- Remove libcombo stuff
+- Make sure the libraries are going to /usr/lib64 on x86_64 architecure
+
 * Tue Aug 26 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.0.6-13
 - fix license tag
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnustep-make/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	6 Aug 2008 11:39:27 -0000	1.4
+++ sources	24 Mar 2009 19:30:01 -0000	1.5
@@ -1 +1 @@
-58ebb672d10925a2004242eab1aec225  gnustep-make-2.0.6.tar.gz
+13bd26f135cbc38a94dfb220e9ffd460  gnustep-make-2.0.8.tar.gz