SPECS: gnustep-examples.spec - rel 2 - fixed install - updated files

[baggins]

Author: baggins                      Date: Thu Aug 30 15:04:09 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rel 2
- fixed install
- updated files

---- Files affected:
SPECS:
   gnustep-examples.spec (1.13 -> 1.14) 

---- Diffs:

================================================================
Index: SPECS/gnustep-examples.spec
diff -u SPECS/gnustep-examples.spec:1.13 SPECS/gnustep-examples.spec:1.14
--- SPECS/gnustep-examples.spec:1.13	Tue Feb 13 08:16:47 2007
+++ SPECS/gnustep-examples.spec	Thu Aug 30 17:04:04 2007
@@ -3,20 +3,19 @@
 Summary(pl.UTF-8):	Przykłady do GNUstepa
 Name:		gnustep-examples
 Version:	1.1.0
-Release:	1
+Release:	2
 License:	GPL
 Vendor:		The GNUstep Project
 Group:		X11/Applications
 Source0:	ftp://ftp.gnustep.org/pub/gnustep/core/%{name}-%{version}.tar.gz
 # Source0-md5:	8ebf37723c89c4fcd4093164ffa50a63
 Patch0:		%{name}-pass-arguments.patch
+Patch1:		%{name}-install.patch
 URL:		http://www.gnustep.org/
 BuildRequires:	gnustep-gui-devel >= 0.11.0
 Requires:	gnustep-back
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define         _prefix         /usr/%{_lib}/GNUstep
-
 %description
 This is a full collection of examples for the GNUstep libraries. Some
 tests are very old, other are newer; some are up-to-date, other are
@@ -29,9 +28,10 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
-export GNUSTEP_MAKEFILES=%{_prefix}/System/Library/Makefiles
+export GNUSTEP_MAKEFILES=%{_datadir}/GNUstep/Makefiles
 export GNUSTEP_FLATTENED=yes
 
 %{__make} \
@@ -40,11 +40,12 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-export GNUSTEP_MAKEFILES=%{_prefix}/System/Library/Makefiles
+export GNUSTEP_MAKEFILES=%{_datadir}/GNUstep/Makefiles
 export GNUSTEP_FLATTENED=yes
 
 %{__make} install \
-	GNUSTEP_INSTALLATION_DIR=$RPM_BUILD_ROOT%{_prefix}/System
+	GNUSTEP_INSTALLATION_DOMAIN=SYSTEM \
+	DESTDIR=$RPM_BUILD_ROOT 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -56,27 +57,27 @@
 %defattr(644,root,root,755)
 %doc README
 
-%dir %{_prefix}/System/Applications/*.app
-%{_prefix}/System/Applications/*.app/Resources
-%{_prefix}/System/Applications/*.app/*.openapp
-%attr(755,root,root) %{_prefix}/System/Applications/Calculator.app/Calculator
-%attr(755,root,root) %{_prefix}/System/Applications/CurrencyConverter.app/CurrencyConverter
-%attr(755,root,root) %{_prefix}/System/Applications/GSTest.app/GSTest
-%attr(755,root,root) %{_prefix}/System/Applications/Ink.app/Ink
-%attr(755,root,root) %{_prefix}/System/Applications/NSBrowserTest.app/NSBrowserTest
-%attr(755,root,root) %{_prefix}/System/Applications/NSImageTest.app/NSImageTest
-%attr(755,root,root) %{_prefix}/System/Applications/NSPanelTest.app/NSPanelTest
-%attr(755,root,root) %{_prefix}/System/Applications/NSScreenTest.app/NSScreenTest
-%attr(755,root,root) %{_prefix}/System/Applications/md5Digest.app/md5Digest
-
-%dir %{_prefix}/System/Library/ApplicationSupport/GSTest
-%dir %{_prefix}/System/Library/ApplicationSupport/GSTest/*.bundle
-%{_prefix}/System/Library/ApplicationSupport/GSTest/*.bundle/Resources
-%attr(755,root,root) %{_prefix}/System/Library/ApplicationSupport/GSTest/*.bundle/[!Rs]*
-
-%dir %{_prefix}/System/Library/Services/example.service
-%{_prefix}/System/Library/Services/example.service/Resources
-%attr(755,root,root) %{_prefix}/System/Library/Services/example.service/example
+%attr(755,root,root) %{_bindir}/*
+
+%dir %{_libdir}/GNUstep/Applications/*.app
+%{_libdir}/GNUstep/Applications/*.app/Resources
+%attr(755,root,root) %{_libdir}/GNUstep/Applications/Calculator.app/Calculator
+%attr(755,root,root) %{_libdir}/GNUstep/Applications/CurrencyConverter.app/CurrencyConverter
+%attr(755,root,root) %{_libdir}/GNUstep/Applications/GSTest.app/GSTest
+%attr(755,root,root) %{_libdir}/GNUstep/Applications/Ink.app/Ink
+%attr(755,root,root) %{_libdir}/GNUstep/Applications/NSBrowserTest.app/NSBrowserTest
+%attr(755,root,root) %{_libdir}/GNUstep/Applications/NSImageTest.app/NSImageTest
+%attr(755,root,root) %{_libdir}/GNUstep/Applications/NSPanelTest.app/NSPanelTest
+%attr(755,root,root) %{_libdir}/GNUstep/Applications/NSScreenTest.app/NSScreenTest
+%attr(755,root,root) %{_libdir}/GNUstep/Applications/md5Digest.app/md5Digest
+
+%dir %{_libdir}/GNUstep/Bundles/*.bundle
+%{_libdir}/GNUstep/Bundles/*.bundle/Resources
+%attr(755,root,root) %{_libdir}/GNUstep/Bundles/*.bundle/*-test
+
+%dir %{_libdir}/GNUstep/Services/example.service
+%{_libdir}/GNUstep/Services/example.service/Resources
+%attr(755,root,root) %{_libdir}/GNUstep/Services/example.service/example
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -84,6 +85,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.14  2007/08/30 15:04:04  baggins
+- rel 2
+- fixed install
+- updated files
+
 Revision 1.13  2007/02/13 07:16:47  glen
 - tabs in preamble
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/gnustep-examples.spec?r1=1.13&r2=1.14&f=u