Author: aredridel Date: Sat Jun 16 21:58:39 2007 GMT Module: SPECS Tag: HEAD ---- Log message: - 2.0.1 - FHS layout (untested)
---- Files affected: SPECS: gnustep-make.spec (1.68 -> 1.69) ---- Diffs: ================================================================ Index: SPECS/gnustep-make.spec diff -u SPECS/gnustep-make.spec:1.68 SPECS/gnustep-make.spec:1.69 --- SPECS/gnustep-make.spec:1.68 Tue Apr 17 13:32:23 2007 +++ SPECS/gnustep-make.spec Sat Jun 16 23:58:34 2007 @@ -1,37 +1,28 @@ # $Revision$, $Date$ # -# Conditional build: -%bcond_without doc # don't build documentation (for bootstrap) -# Summary: GNUstep Makefile package Summary(pl.UTF-8): Pakiet GNUstep Makefile Name: gnustep-make -Version: 1.13.0 +Version: 2.0.1 Release: 1 License: GPL -Vendor: The GNUstep Project Group: Applications/System Source0: ftp://ftp.gnustep.org/pub/gnustep/core/%{name}-%{version}.tar.gz -# Source0-md5: 1d7a434e751c58c6390055c14ada302b +# Source0-md5: f268733ea23f53e211e3977e27b46098 Patch0: %{name}-no-LD_LIBRARY_PATH.patch URL: http://www.gnustep.org/ BuildRequires: autoconf >= 2.57 BuildRequires: automake -%if %{with doc} -BuildRequires: gnustep-make >= 1.13.0 # texi2html >= 1.61 (with -init_file) is included in tetex >= 3 BuildRequires: tetex >= 1:3.0 BuildRequires: tetex-dvips BuildRequires: tetex-format-latex BuildRequires: tetex-format-plain BuildRequires: texinfo-texi2dvi -%endif Requires: gnustep-dirs Conflicts: gnustep-core BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _prefix /usr/%{_lib}/GNUstep - %description This package contains the basic tools needed to run GNUstep applications. @@ -70,15 +61,12 @@ %{__autoconf} %configure \ --with-library-combo=gnu-gnu-gnu \ + --with-layout=fhs \ --with-tar=tar %{__make} -%if %{with doc} -GNUSTEP_MAKEFILES=%{_prefix}/System/Library/Makefiles \ -GNUSTEP_FLATTENED=yes \ -%{__make} -C Documentation -%endif +#GNUSTEP_MAKEFILES=`pwd` %{__make} -C Documentation %install rm -rf $RPM_BUILD_ROOT @@ -86,18 +74,11 @@ %{__make} install \ special_prefix=$RPM_BUILD_ROOT -%if %{with doc} -GNUSTEP_MAKEFILES=%{_prefix}/System/Library/Makefiles \ -GNUSTEP_FLATTENED=yes \ -%{__make} -C Documentation install \ - GNUSTEP_INSTALLATION_DIR=$RPM_BUILD_ROOT%{_prefix}/System -%endif - install -d $RPM_BUILD_ROOT/etc/profile.d # Create profile files cat > $RPM_BUILD_ROOT/etc/profile.d/GNUstep.sh << EOF #!/bin/sh -. %{_prefix}/System/Library/Makefiles/GNUstep.sh +. %{_datadir}/GNUstep/Makefiles/GNUstep.sh if [ ! -d \$GNUSTEP_USER_ROOT ]; then mkdir \$GNUSTEP_USER_ROOT @@ -107,7 +88,7 @@ cat > $RPM_BUILD_ROOT/etc/profile.d/GNUstep.csh << EOF #!/bin/csh -source %{_prefix}/System/Library/Makefiles/GNUstep.csh +source %{_datadir}Makefiles/GNUstep.csh test -d \$GNUSTEP_USER_ROOT if (\$status != 0) then @@ -136,41 +117,16 @@ %doc ChangeLog %attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/profile.d/GNUstep.sh %attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/profile.d/GNUstep.csh +%attr(755,root,root) %{_bindir}/* %dir %{_sysconfdir}/GNUstep %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/GNUstep/GNUstep.conf # GNUstep top-level -%dir %{_prefix} -%{_prefix}/Local -%dir %{_prefix}/System - -# System domain -%{_prefix}/System/Applications -%dir %{_prefix}/System/Library -%{_prefix}/System/share -%attr(755,root,root) %{_prefix}/System/Tools +%dir %{_datadir}/GNUstep # System/Library folder -%{_prefix}/System/Library/ApplicationSupport -%{_prefix}/System/Library/Bundles -%{_prefix}/System/Library/ColorPickers -%{_prefix}/System/Library/Colors -%{_prefix}/System/Library/DocTemplates -%if %{with doc} -%docdir %{_prefix}/System/Library/Documentation -%dir %{_prefix}/System/Library/Documentation -%endif -%{_prefix}/System/Library/Fonts -%{_prefix}/System/Library/Frameworks -%{_prefix}/System/Library/Headers -%{_prefix}/System/Library/Images -%{_prefix}/System/Library/KeyBindings -%{_prefix}/System/Library/Libraries -%dir %{_prefix}/System/Library/Makefiles -%{_prefix}/System/Library/PostScript -%{_prefix}/System/Library/Services -%{_prefix}/System/Library/Sounds +%dir %{_datadir}/GNUstep/Makefiles %if %{with doc} %dir %{_prefix}/System/Library/Documentation/Developer @@ -187,11 +143,10 @@ %{_prefix}/System/Library/Documentation/man/man7/GNUstep.7* %endif -%attr(755,root,root) %{_prefix}/System/Library/Makefiles/config.* -%{_prefix}/System/Library/Makefiles/tar-exclude-list -%attr(755,root,root) %{_prefix}/System/Library/Makefiles/*.sh -%attr(755,root,root) %{_prefix}/System/Library/Makefiles/*.csh -%attr(755,root,root) %{_prefix}/System/Library/Makefiles/which_lib +%attr(755,root,root) %{_datadir}/GNUstep/Makefiles/config.* +%{_datadir}/GNUstep/Makefiles/tar-exclude-list +%attr(755,root,root) %{_datadir}/GNUstep/Makefiles/*.sh +%attr(755,root,root) %{_datadir}/GNUstep/Makefiles/*.csh %files devel %defattr(644,root,root,755) @@ -200,12 +155,14 @@ %{_prefix}/System/Library/Documentation/Developer/Make/Manual %endif -%{_prefix}/System/Library/Makefiles/*.make -%{_prefix}/System/Library/Makefiles/*.template -%{_prefix}/System/Library/Makefiles/Instance -%{_prefix}/System/Library/Makefiles/Master -%attr(755,root,root) %{_prefix}/System/Library/Makefiles/install-sh -%attr(755,root,root) %{_prefix}/System/Library/Makefiles/mkinstalldirs +%{_datadir}/GNUstep/Makefiles/*.make +%{_datadir}/GNUstep/Makefiles/*.template +%{_datadir}/GNUstep/Makefiles/Instance +%{_datadir}/GNUstep/Makefiles/Master +%{_datadir}/GNUstep/Makefiles/gnustep-make-help + +%attr(755,root,root) %{_datadir}/GNUstep/Makefiles/install-sh +%attr(755,root,root) %{_datadir}/GNUstep/Makefiles/mkinstalldirs %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -213,6 +170,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.69 2007/06/16 21:58:34 aredridel +- 2.0.1 +- FHS layout (untested) + Revision 1.68 2007/04/17 11:32:23 glen - unify docs->doc bcond @@ -432,14 +393,3 @@ Revision 1.3 2000/05/20 13:37:50 kloczek - spec adapterized and partialy rewrited. -* Sat Sep 18 1999 Christopher Seawood <[EMAIL PROTECTED]> -- Version 0.6.0 -- Added nodupsh patch - -* Sat Aug 07 1999 Christopher Seawood <[EMAIL PROTECTED]> -- Updated to cvs dawn_6 branch - -* Fri Jun 25 1999 Christopher Seawood <[EMAIL PROTECTED]> -- Split into separate rpm from gnustep-core -- Build from cvs snapshot -- Added services patch ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnustep-make.spec?r1=1.68&r2=1.69&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
