Author: baggins Date: Wed Oct 3 19:18:55 2007 GMT
Module: SPECS Tag: HEAD
---- Log message:
- updated to 20070830 snap
- updated files for new FHS compliant gnustep
---- Files affected:
SPECS:
Backbone.spec (1.12 -> 1.13)
---- Diffs:
================================================================
Index: SPECS/Backbone.spec
diff -u SPECS/Backbone.spec:1.12 SPECS/Backbone.spec:1.13
--- SPECS/Backbone.spec:1.12 Mon Feb 12 22:21:30 2007
+++ SPECS/Backbone.spec Wed Oct 3 21:18:49 2007
@@ -1,17 +1,18 @@
# $Revision$, $Date$
-%define cvs 20050327
+%define cvs 20070830
Summary: GNUstep backbone apps, including Preferences
Summary(pl.UTF-8): Szkieletowe aplikacje GNUstepa, w tym Preferences
Name: Backbone
Version: 1.2.99
-Release: 0.%{cvs}.3
+Release: 0.%{cvs}.1
License: GPL
Group: X11/Applications
Source0: %{name}-%{cvs}.tar.gz
-# Source0-md5: 7e599ad7c8acadc81b682602e2906175
+# Source0-md5: e27413e9e105cfa3bb2eaf953fa3661f
Patch0: %{name}-buildinplace.patch
Patch1: %{name}-installprefix.patch
Patch2: %{name}-pass-arguments.patch
+Patch3: %{name}-install.patch
URL: http://www.nongnu.org/backbone/
BuildRequires: gnustep-gui-devel
Obsoletes: Preferences
@@ -19,17 +20,6 @@
Obsoletes: TextEdit
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
GNUstep Backbone applications, including Preferences.
@@ -55,20 +45,27 @@
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
%build
-. %{_prefix}/System/Library/Makefiles/GNUstep.sh
+export GNUSTEP_MAKEFILES=%{_datadir}/GNUstep/Makefiles
+export GNUSTEP_FLATTENED=yes
%{__make} -j1 \
OPTFLAG="%{rpmcflags}" \
messages=yes
%install
rm -rf $RPM_BUILD_ROOT
-. %{_prefix}/System/Library/Makefiles/GNUstep.sh
+export GNUSTEP_MAKEFILES=%{_datadir}/GNUstep/Makefiles
+export GNUSTEP_FLATTENED=yes
%{__make} -j1 install \
- INSTALL_ROOT_DIR=$RPM_BUILD_ROOT \
- GNUSTEP_INSTALLATION_DIR=$RPM_BUILD_ROOT%{_prefix}/System
+ GNUSTEP_INSTALLATION_DOMAIN=SYSTEM \
+ DESTDIR=$RPM_BUILD_ROOT
+
+for f in Calculator CurrencyConverter GSTest Ink NSBrowserTest NSImageTest
NSPanelTest NSScreenTest md5Digest ; do
+ ln -sf %{_libdir}/GNUstep/Applications/$f.app/$f
$RPM_BUILD_ROOT/%{_bindir}/$f
+done
%clean
rm -rf $RPM_BUILD_ROOT
@@ -78,55 +75,55 @@
%files
%defattr(644,root,root,755)
-%dir %{_prefix}/System/Applications/*.app
-%dir %{_prefix}/System/Applications/*.app/Resources
-%{_prefix}/System/Applications/*.app/Resources/*.desktop
-%{_prefix}/System/Applications/*.app/Resources/*.plist
-%{_prefix}/System/Applications/*.app/Resources/*.tiff
-%{_prefix}/System/Applications/*.app/Resources/*.txt
-%{_prefix}/System/Applications/*.app/Resources/*.svcs
-%{_prefix}/System/Applications/*.app/Resources/English.lproj
-%lang(fr) %{_prefix}/System/Applications/*.app/Resources/French.lproj
-%lang(de) %{_prefix}/System/Applications/*.app/Resources/German.lproj
-%lang(hu) %{_prefix}/System/Applications/*.app/Resources/Hungarian.lproj
-%lang(nb) %{_prefix}/System/Applications/*.app/Resources/Norwegian.lproj
-%lang(ru) %{_prefix}/System/Applications/*.app/Resources/Russian.lproj
-%lang(es) %{_prefix}/System/Applications/*.app/Resources/Spanish.lproj
-%lang(se) %{_prefix}/System/Applications/*.app/Resources/Swedish.lproj
-%lang(tr) %{_prefix}/System/Applications/*.app/Resources/Turkish.lproj
-%dir %{_prefix}/System/Applications/*.app/%{gscpu}
-%dir %{_prefix}/System/Applications/*.app/%{gscpu}/%{gsos}
-%dir %{_prefix}/System/Applications/*.app/%{gscpu}/%{gsos}/%{libcombo}
-%attr(755,root,root) %{_prefix}/System/Applications/Preferences.app/Preferences
-%attr(755,root,root)
%{_prefix}/System/Applications/Preferences.app/%{gscpu}/%{gsos}/%{libcombo}/Preferences
-%attr(755,root,root) %{_prefix}/System/Applications/Terminal.app/Terminal
-%attr(755,root,root)
%{_prefix}/System/Applications/Terminal.app/%{gscpu}/%{gsos}/%{libcombo}/Terminal
-%attr(755,root,root) %{_prefix}/System/Applications/TextEdit.app/TextEdit
-%attr(755,root,root)
%{_prefix}/System/Applications/TextEdit.app/%{gscpu}/%{gsos}/%{libcombo}/TextEdit
-%{_prefix}/System/Applications/*.app/%{gscpu}/%{gsos}/%{libcombo}/*.openapp
-%attr(755,root,root) %{_prefix}/System/Tools/%{gscpu}/%{gsos}/%{libcombo}/*
-
-%dir %{_prefix}/System/Library/Frameworks/*.framework
-%{_prefix}/System/Library/Frameworks/*.framework/Resources
-%dir %{_prefix}/System/Library/Frameworks/*.framework/Versions
-%dir %{_prefix}/System/Library/Frameworks/*.framework/Versions/*
-%{_prefix}/System/Library/Frameworks/*.framework/Versions/1.1.0/Resources
-%attr(755,root,root)
%{_prefix}/System/Library/Frameworks/*.framework/Versions/1.1.0/%{gscpu}
-
-%attr(755,root,root)
%{_prefix}/System/Library/Libraries/%{gscpu}/%{gsos}/%{libcombo}/lib*.so.*
-
-%dir %{_prefix}/System/Library/Preferences
-%dir %{_prefix}/System/Library/Preferences/*.prefs
-%{_prefix}/System/Library/Preferences/*.prefs/Resources
-%attr(755,root,root) %{_prefix}/System/Library/Preferences/*.prefs/%{gscpu}
+%dir %{_libdir}/GNUstep/Applications/*.app
+%dir %{_libdir}/GNUstep/Applications/*.app/Resources
+%{_libdir}/GNUstep/Applications/*.app/Resources/*.desktop
+%{_libdir}/GNUstep/Applications/*.app/Resources/*.plist
+%{_libdir}/GNUstep/Applications/*.app/Resources/*.tiff
+%{_libdir}/GNUstep/Applications/*.app/Resources/*.txt
+%{_libdir}/GNUstep/Applications/*.app/Resources/*.svcs
+%{_libdir}/GNUstep/Applications/*.app/Resources/English.lproj
+%lang(fr) %{_libdir}/GNUstep/Applications/*.app/Resources/French.lproj
+%lang(de) %{_libdir}/GNUstep/Applications/*.app/Resources/German.lproj
+%lang(hu) %{_libdir}/GNUstep/Applications/*.app/Resources/Hungarian.lproj
+%lang(nb) %{_libdir}/GNUstep/Applications/*.app/Resources/Norwegian.lproj
+%lang(ru) %{_libdir}/GNUstep/Applications/*.app/Resources/Russian.lproj
+%lang(es) %{_libdir}/GNUstep/Applications/*.app/Resources/Spanish.lproj
+%lang(se) %{_libdir}/GNUstep/Applications/*.app/Resources/Swedish.lproj
+%lang(tr) %{_libdir}/GNUstep/Applications/*.app/Resources/Turkish.lproj
+%dir %{_libdir}/GNUstep/Applications/*.app/%{gscpu}
+%dir %{_libdir}/GNUstep/Applications/*.app/%{gscpu}/%{gsos}
+%dir %{_libdir}/GNUstep/Applications/*.app/%{gscpu}/%{gsos}/%{libcombo}
+%attr(755,root,root)
%{_libdir}/GNUstep/Applications/Preferences.app/Preferences
+%attr(755,root,root)
%{_libdir}/GNUstep/Applications/Preferences.app/%{gscpu}/%{gsos}/%{libcombo}/Preferences
+%attr(755,root,root) %{_libdir}/GNUstep/Applications/Terminal.app/Terminal
+%attr(755,root,root)
%{_libdir}/GNUstep/Applications/Terminal.app/%{gscpu}/%{gsos}/%{libcombo}/Terminal
+%attr(755,root,root) %{_libdir}/GNUstep/Applications/TextEdit.app/TextEdit
+%attr(755,root,root)
%{_libdir}/GNUstep/Applications/TextEdit.app/%{gscpu}/%{gsos}/%{libcombo}/TextEdit
+%{_libdir}/GNUstep/Applications/*.app/%{gscpu}/%{gsos}/%{libcombo}/*.openapp
+%attr(755,root,root) %{_libdir}/GNUstep/Tools/%{gscpu}/%{gsos}/%{libcombo}/*
+
+%dir %{_libdir}/GNUstep/Library/Frameworks/*.framework
+%{_libdir}/GNUstep/Library/Frameworks/*.framework/Resources
+%dir %{_libdir}/GNUstep/Library/Frameworks/*.framework/Versions
+%dir %{_libdir}/GNUstep/Library/Frameworks/*.framework/Versions/*
+%{_libdir}/GNUstep/Library/Frameworks/*.framework/Versions/1.1.0/Resources
+%attr(755,root,root)
%{_libdir}/GNUstep/Library/Frameworks/*.framework/Versions/1.1.0/%{gscpu}
+
+%attr(755,root,root)
%{_libdir}/GNUstep/Library/Libraries/%{gscpu}/%{gsos}/%{libcombo}/lib*.so.*
+
+%dir %{_libdir}/GNUstep/Library/Preferences
+%dir %{_libdir}/GNUstep/Library/Preferences/*.prefs
+%{_libdir}/GNUstep/Library/Preferences/*.prefs/Resources
+%attr(755,root,root) %{_libdir}/GNUstep/Library/Preferences/*.prefs/%{gscpu}
%files devel
%defattr(644,root,root,755)
-%{_prefix}/System/Library/Frameworks/*.framework/Headers
-%{_prefix}/System/Library/Frameworks/*.framework/Versions/1.1.0/Headers
-%{_prefix}/System/Library/Headers/%{libcombo}/*
+%{_libdir}/GNUstep/Library/Frameworks/*.framework/Headers
+%{_libdir}/GNUstep/Library/Frameworks/*.framework/Versions/1.1.0/Headers
+%{_libdir}/GNUstep/Library/Headers/%{libcombo}/*
-%attr(755,root,root)
%{_prefix}/System/Library/Libraries/%{gscpu}/%{gsos}/%{libcombo}/lib*.so
+%attr(755,root,root)
%{_libdir}/GNUstep/Library/Libraries/%{gscpu}/%{gsos}/%{libcombo}/lib*.so
@@ -136,6 +133,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.13 2007/10/03 19:18:49 baggins
+- updated to 20070830 snap
+- updated files for new FHS compliant gnustep
+
Revision 1.12 2007/02/12 21:21:30 glen
- tabs in preamle
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/Backbone.spec?r1=1.12&r2=1.13&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
