- rel 5

- updated for new build system

Changed files:
    Affiche.spec -> 1.12

diff --git a/Affiche.spec b/Affiche.spec
index 8e65da6469de32fc9f7efa51d56a6e8ef3b6a963..76f852cf6525785e78b8dc6c05a1e107b439ffea 100644 (file)
--- a/Affiche.spec
+++ b/Affiche.spec
@@ -2,7 +2,7 @@ Summary:        Application allowing to "stick little notes" on desktop
 Summary(pl.UTF-8):     Aplikacja pozwalająca przyklejać małe notatki na pulpicie
 Name:          Affiche
 Version:       0.6.0
-Release:       4
+Release:       5
 License:       GPL
 Group:         X11/Applications
 Source0:       http://www.collaboration-world.com/affiche.data/releases/Stable/%{name}-%{version}.tar.gz
@@ -12,17 +12,6 @@ BuildRequires:       gnustep-gui-devel
 Requires:      gnustep-gui
 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
 Affiche is a little application that allows people to 'stick little
 notes' on your desktop.
@@ -35,17 +24,24 @@ notatki na pulpicie.
 %setup -q -n %{name}
 
 %build
-. %{_prefix}/System/Library/Makefiles/GNUstep.sh
+export GNUSTEP_MAKEFILES=%{_datadir}/GNUstep/Makefiles
+export GNUSTEP_FLATTENED=yes
 %{__make} \
        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} install \
-       GNUSTEP_INSTALLATION_DIR=$RPM_BUILD_ROOT%{_prefix}/System
+       GNUSTEP_INSTALLATION_DOMAIN=SYSTEM \
+       DESTDIR=$RPM_BUILD_ROOT 
+
+for f in Affiche ; do
+       ln -sf %{_libdir}/GNUstep/Applications/$f.app/$f $RPM_BUILD_ROOT/%{_bindir}/$f
+done
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -53,21 +49,17 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc ChangeLog README TODO
-%dir %{_prefix}/System/Applications/Affiche.app
-%attr(755,root,root) %{_prefix}/System/Applications/Affiche.app/Affiche
-%dir %{_prefix}/System/Applications/Affiche.app/Resources
-%{_prefix}/System/Applications/Affiche.app/Resources/*.desktop
-%{_prefix}/System/Applications/Affiche.app/Resources/*.plist
-%{_prefix}/System/Applications/Affiche.app/Resources/*.tiff
-%{_prefix}/System/Applications/Affiche.app/Resources/English.lproj
-%lang(fr) %{_prefix}/System/Applications/Affiche.app/Resources/French.lproj
-%lang(de) %{_prefix}/System/Applications/Affiche.app/Resources/German.lproj
+%attr(755,root,root) %{_bindir}/*
+%dir %{_libdir}/GNUstep/Applications/Affiche.app
+%attr(755,root,root) %{_libdir}/GNUstep/Applications/Affiche.app/Affiche
+%dir %{_libdir}/GNUstep/Applications/Affiche.app/Resources
+%{_libdir}/GNUstep/Applications/Affiche.app/Resources/*.desktop
+%{_libdir}/GNUstep/Applications/Affiche.app/Resources/*.plist
+%{_libdir}/GNUstep/Applications/Affiche.app/Resources/*.tiff
+%{_libdir}/GNUstep/Applications/Affiche.app/Resources/English.lproj
+%lang(fr) %{_libdir}/GNUstep/Applications/Affiche.app/Resources/French.lproj
+%lang(de) %{_libdir}/GNUstep/Applications/Affiche.app/Resources/German.lproj
 # ISO-639-2 (not in 639-1)
-%lang(art-lojban) %{_prefix}/System/Applications/Affiche.app/Resources/Lojban.lproj
-%lang(es) %{_prefix}/System/Applications/Affiche.app/Resources/Spanish.lproj
-%lang(sv) %{_prefix}/System/Applications/Affiche.app/Resources/Swedish.lproj
-%dir %{_prefix}/System/Applications/Affiche.app/%{gscpu}
-%dir %{_prefix}/System/Applications/Affiche.app/%{gscpu}/%{gsos}
-%dir %{_prefix}/System/Applications/Affiche.app/%{gscpu}/%{gsos}/%{libcombo}
-%attr(755,root,root) %{_prefix}/System/Applications/Affiche.app/%{gscpu}/%{gsos}/%{libcombo}/Affiche
-%{_prefix}/System/Applications/Affiche.app/%{gscpu}/%{gsos}/%{libcombo}/*.openapp
+%lang(art-lojban) %{_libdir}/GNUstep/Applications/Affiche.app/Resources/Lojban.lproj
+%lang(es) %{_libdir}/GNUstep/Applications/Affiche.app/Resources/Spanish.lproj
+%lang(sv) %{_libdir}/GNUstep/Applications/Affiche.app/Resources/Swedish.lproj