Author: qboosh                       Date: Fri Dec 29 01:32:55 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated to 1.1.0, updated patch, flattened directory structure

---- Files affected:
SPECS:
   gnustep-examples.spec (1.10 -> 1.11) 

---- Diffs:

================================================================
Index: SPECS/gnustep-examples.spec
diff -u SPECS/gnustep-examples.spec:1.10 SPECS/gnustep-examples.spec:1.11
--- SPECS/gnustep-examples.spec:1.10    Tue Sep  6 22:51:00 2005
+++ SPECS/gnustep-examples.spec Fri Dec 29 02:32:50 2006
@@ -2,30 +2,21 @@
 Summary:       GNUstep examples
 Summary(pl):   Przykłady do GNUstepa
 Name:          gnustep-examples
-Version:       1.0.0
-Release:       4
+Version:       1.1.0
+Release:       1
 License:       GPL
 Vendor:                The GNUstep Project
 Group:         X11/Applications
 Source0:       ftp://ftp.gnustep.org/pub/gnustep/core/%{name}-%{version}.tar.gz
-# Source0-md5: 3409eca37e4a2f9f560cc06907a38e67
+# Source0-md5: 8ebf37723c89c4fcd4093164ffa50a63
 Patch0:                %{name}-pass-arguments.patch
 URL:           http://www.gnustep.org/
-BuildRequires: gnustep-gui-devel
+BuildRequires: gnustep-gui-devel >= 0.11.0
 Requires:      gnustep-back
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define         _prefix         /usr/%{_lib}/GNUstep
 
-%define                libcombo        gnu-gnu-gnu
-%define                gsos            linux-gnu
-%ifarch %{ix86}
-%define                gscpu           ix86
-%else
-# also s/alpha.*/alpha/, but we use only "alpha" arch for now
-%define                gscpu           %(echo %{_target_cpu} | sed -e 
's/amd64/x86_64/;s/ppc/powerpc/')
-%endif
-
 %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
@@ -40,7 +31,8 @@
 %patch0 -p1
 
 %build
-. %{_prefix}/System/Library/Makefiles/GNUstep.sh
+export GNUSTEP_MAKEFILES=%{_prefix}/System/Library/Makefiles
+export GNUSTEP_FLATTENED=yes
 
 %{__make} \
        OPTFLAG="%{rpmcflags}" \
@@ -48,7 +40,8 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-. %{_prefix}/System/Library/Makefiles/GNUstep.sh
+export GNUSTEP_MAKEFILES=%{_prefix}/System/Library/Makefiles
+export GNUSTEP_FLATTENED=yes
 
 %{__make} install \
        GNUSTEP_INSTALLATION_DIR=$RPM_BUILD_ROOT%{_prefix}/System
@@ -65,29 +58,25 @@
 
 %dir %{_prefix}/System/Applications/*.app
 %{_prefix}/System/Applications/*.app/Resources
-%dir %{_prefix}/System/Applications/*.app/%{gscpu}
-%dir %{_prefix}/System/Applications/*.app/%{gscpu}/%{gsos}
-%dir %{_prefix}/System/Applications/*.app/%{gscpu}/%{gsos}/%{libcombo}
-%{_prefix}/System/Applications/*.app/%{gscpu}/%{gsos}/%{libcombo}/*.openapp
+%{_prefix}/System/Applications/*.app/*.openapp
 %attr(755,root,root) %{_prefix}/System/Applications/Calculator.app/Calculator
-%attr(755,root,root) 
%{_prefix}/System/Applications/Calculator.app/%{gscpu}/%{gsos}/%{libcombo}/Calculator
 %attr(755,root,root) 
%{_prefix}/System/Applications/CurrencyConverter.app/CurrencyConverter
-%attr(755,root,root) 
%{_prefix}/System/Applications/CurrencyConverter.app/%{gscpu}/%{gsos}/%{libcombo}/CurrencyConverter
 %attr(755,root,root) %{_prefix}/System/Applications/GSTest.app/GSTest
-%attr(755,root,root) 
%{_prefix}/System/Applications/GSTest.app/%{gscpu}/%{gsos}/%{libcombo}/GSTest
 %attr(755,root,root) %{_prefix}/System/Applications/Ink.app/Ink
-%attr(755,root,root) 
%{_prefix}/System/Applications/Ink.app/%{gscpu}/%{gsos}/%{libcombo}/Ink
 %attr(755,root,root) 
%{_prefix}/System/Applications/NSBrowserTest.app/NSBrowserTest
-%attr(755,root,root) 
%{_prefix}/System/Applications/NSBrowserTest.app/%{gscpu}/%{gsos}/%{libcombo}/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/NSPanelTest.app/%{gscpu}/%{gsos}/%{libcombo}/NSPanelTest
 %attr(755,root,root) 
%{_prefix}/System/Applications/NSScreenTest.app/NSScreenTest
-%attr(755,root,root) 
%{_prefix}/System/Applications/NSScreenTest.app/%{gscpu}/%{gsos}/%{libcombo}/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/%{gscpu}
+%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
 
 %define date   %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -95,6 +84,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11  2006/12/29 01:32:50  qboosh
+- updated to 1.1.0, updated patch, flattened directory structure
+
 Revision 1.10  2005/09/06 20:51:00  arekm
 - rel 4
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/gnustep-examples.spec?r1=1.10&r2=1.11&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to