Fixed RPM generation (using supplied spec file) for gnustep-make

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@32603 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2011-03-16 10:25:42 +00:00
parent ecba301ec9
commit 9ee621523a
3 changed files with 14 additions and 3 deletions

View file

@ -1,3 +1,11 @@
2011-03-16 Nicola Pero <nicola.pero@meta-innovation.com>
* GNUmakefile.in (rpm): Depend on svn-dist and updated
location of .tar.gz file to copy.
* gnustep-make.spec.in (CFLAGS): Added --with-layout=gnustep
to configure command.
(%files): Added /etc/GNUstep/GNUstep.conf.
2011-03-16 Nicola Pero <nicola.pero@meta-innovation.com>
* Documentation/gnustep-filesystem.texi: Updated documentation for

View file

@ -377,8 +377,8 @@ test-RPM_TOPDIR:
# rpmbuild and used 'rpm -ba' instead. It can be removed when we are
# reasonably sure no more old RPM versions (not having rpmbuild), are
# still around.
rpm: test-RPM_TOPDIR dist
cp ../gnustep-make-$(GNUSTEP_MAKE_VERSION).tar.gz $(RPM_TOPDIR)/SOURCES/
rpm: test-RPM_TOPDIR svn-dist
cp gnustep-make-$(GNUSTEP_MAKE_VERSION).tar.gz $(RPM_TOPDIR)/SOURCES/
cp gnustep-make.spec $(RPM_TOPDIR)/SPECS/
cd $(RPM_TOPDIR)/SPECS/
if which rpmbuild > /dev/null 2>/dev/null; then \

View file

@ -33,7 +33,7 @@ GNUstep filesystem layout based on %{gs_prefix}.
%setup -n %{gs_name}-%{gs_version}
%build
CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{gs_prefix} --with-library-combo=%{gs_libcombo}
CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{gs_prefix} --with-library-combo=%{gs_libcombo} --with-layout=gnustep
make
%install
@ -65,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT
# the package everything which was installed inside /usr/GNUstep/
%{gs_prefix}
# Also include the GNUstep config file
/etc/GNUstep/GNUstep.conf
# Add the profiles for linux as configuration files <FIXME gdomap etc>
%ifos Linux
%config /etc/profile.d/GNUstep.sh