- updated to 20070830 snap

- updated files for new FHS compliant gnustep

Changed files:
    Backbone.spec -> 1.13

diff --git a/Backbone.spec b/Backbone.spec
index 2fc02464e2e87d3854449be255e7f22fb8c07b5b..17d1f30a92bdb13fc259f79838e7cccd3897976c 100644 (file)
--- a/Backbone.spec
+++ b/Backbone.spec
@@ -1,16 +1,17 @@
-%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
@@ -18,17 +19,6 @@ Obsoletes:   Terminal
 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.
 
@@ -54,20 +44,27 @@ Pliki nagłówkowe dla bibliotek Backbone.
 %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
@@ -77,52 +74,52 @@ rm -rf $RPM_BUILD_ROOT
 
 %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