SPECS: Affiche.spec - rel 5 - updated for new build system

baggins baggins at pld-linux.org
Thu Aug 30 17:20:06 CEST 2007


Author: baggins                      Date: Thu Aug 30 15:20:06 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rel 5
- updated for new build system

---- Files affected:
SPECS:
   Affiche.spec (1.11 -> 1.12) 

---- Diffs:

================================================================
Index: SPECS/Affiche.spec
diff -u SPECS/Affiche.spec:1.11 SPECS/Affiche.spec:1.12
--- SPECS/Affiche.spec:1.11	Mon Feb 12 22:21:30 2007
+++ SPECS/Affiche.spec	Thu Aug 30 17:20:01 2007
@@ -3,7 +3,7 @@
 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
@@ -13,17 +13,6 @@
 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.
@@ -36,17 +25,24 @@
 %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
@@ -54,24 +50,20 @@
 %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
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -79,6 +71,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.12  2007/08/30 15:20:01  baggins
+- rel 5
+- updated for new build system
+
 Revision 1.11  2007/02/12 21:21:30  glen
 - tabs in preamle
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/Affiche.spec?r1=1.11&r2=1.12&f=u



More information about the pld-cvs-commit mailing list