X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=Addresses.spec;h=a7e773df71bc063abd6e13180b160ca70069ac52;hb=2a9a87c96453886d1a2fbcc7e8acb14736592317;hp=17c0f3c3d2a5d395d642781a0394969cb686cc98;hpb=bc5f3e632e9921e5ff392a210720fd6cc3766cbf;p=packages%2FAddresses.git

diff --git a/Addresses.spec b/Addresses.spec
index 17c0f3c..a7e773d 100644
--- a/Addresses.spec
+++ b/Addresses.spec
@@ -1,17 +1,20 @@
 Summary:	Contact manager for GNUstep
 Summary(pl):	Zarz±dca kontaktów dla GNUstepa
 Name:		Addresses
-Version:	0.4.4
-Release:	1
+Version:	0.4.6
+Release:	5
 License:	GPL
 Group:		X11/Applications
-Source0:	http://giesler.biz/bjoern/Downloads/%{name}/%{name}-%{version}.tar.gz
-# Source0-md5:	9ace064497b4775e2a451f39430ac107
-URL:		http://giesler.biz/bjoern/English/Software.html#Addresses
+#Source0Download: http://giesler.biz/bjoern/en/sw_addr.html
+Source0:	http://giesler.biz/bjoern/downloads/%{name}-%{version}.tar.gz
+# Source0-md5:	916a20261663f78a4fcbd9cbea600851
+Patch0:		%{name}-make.patch
+URL:		http://giesler.biz/bjoern/en/sw_addr.html
 BuildRequires:	gnustep-gui-devel >= 0.8.3
+BuildRequires:	gnustep-extensions-devel >= 0.8.6
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define         _prefix         /usr/lib/GNUstep
+%define		_prefix		/usr/%{_lib}/GNUstep
 
 %define		libcombo	gnu-gnu-gnu
 %define		gsos		linux-gnu
@@ -19,7 +22,7 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define		gscpu		ix86
 %else
 # also s/alpha.*/alpha/, but we use only "alpha" arch for now
-%define		gscpu		%{_target_cpu}
+%define		gscpu		%(echo %{_target_cpu} | sed -e 's/amd64/x86_64/;s/ppc/powerpc/')
 %endif
 
 %description
@@ -29,16 +32,33 @@ Contacts is an address book and address book service for GNUstep apps.
 Contacts to ksi±¿ka adresowa oraz us³uga ksi±¿ki adresowej dla
 aplikacji GNUstepa.
 
+%package devel
+Summary:	Header files for Addresses service
+Summary(pl):	Pliki nag³ówkowe dla us³ugi Addresses
+Group:		X11/Development/Libraries
+Requires:	%{name} = %{version}-%{release}
+Requires:	gnustep-gui-devel >= 0.8.3
+
+%description devel
+Header files for Addresses service.
+
+%description devel -l pl
+Pliki nag³ówkowe dla us³ugi Addresses.
+
 %prep
-%setup -q 
+%setup -q -n %{name}-0.4.7
+%patch0 -p1
 
 find . -type d -name CVS | xargs rm -rf
 
+# kill precompiled app
+rm -rf AddressManager/AddressManager.app
+
 %build
 . %{_prefix}/System/Library/Makefiles/GNUstep.sh
 TOPDIR="`pwd`"
 GNUSTEP_LOCAL_ROOT="$RPM_BUILD_ROOT%{_prefix}/System"
-%{__make} \
+%{__make} -j1 \
 	OPTFLAG="%{rpmcflags} -I$RPM_BUILD_DIR/%{name}-%{version}" \
 	debug=no \
 	messages=yes
@@ -46,8 +66,11 @@ GNUSTEP_LOCAL_ROOT="$RPM_BUILD_ROOT%{_prefix}/System"
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
-	GNUSTEP_INSTALLATION_DIR="$RPM_BUILD_ROOT%{_prefix}/System"
+. %{_prefix}/System/Library/Makefiles/GNUstep.sh
+%{__make} -j1 install \
+	GNUSTEP_INSTALLATION_DIR="$RPM_BUILD_ROOT%{_prefix}/System" \
+	debug=no \
+	messages=yes
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -59,41 +82,61 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc TODO
 
+%dir %{_prefix}/System/Applications/AddressManager.app
+%dir %{_prefix}/System/Applications/AddressManager.app/%{gscpu}
+%dir %{_prefix}/System/Applications/AddressManager.app/%{gscpu}/%{gsos}
+%dir %{_prefix}/System/Applications/AddressManager.app/%{gscpu}/%{gsos}/%{libcombo}
+%attr(755,root,root) %{_prefix}/System/Applications/AddressManager.app/%{gscpu}/%{gsos}/%{libcombo}/AddressManager
+%{_prefix}/System/Applications/AddressManager.app/%{gscpu}/%{gsos}/%{libcombo}/*.openapp
+%attr(755,root,root) %{_prefix}/System/Applications/AddressManager.app/AddressManager
+%dir %{_prefix}/System/Applications/AddressManager.app/Resources
+%{_prefix}/System/Applications/AddressManager.app/Resources/*.plist
+%{_prefix}/System/Applications/AddressManager.app/Resources/*.desktop
+%{_prefix}/System/Applications/AddressManager.app/Resources/*.tiff
+%{_prefix}/System/Applications/AddressManager.app/Resources/English.lproj
+%lang(nl) %{_prefix}/System/Applications/AddressManager.app/Resources/Dutch.lproj
+%lang(fr) %{_prefix}/System/Applications/AddressManager.app/Resources/French.lproj
+%lang(de) %{_prefix}/System/Applications/AddressManager.app/Resources/German.lproj
+%lang(es) %{_prefix}/System/Applications/AddressManager.app/Resources/Spanish.lproj
+
 %dir %{_prefix}/System/Library/Frameworks/Addresses.framework
+%{_prefix}/System/Library/Frameworks/Addresses.framework/Resources
 %dir %{_prefix}/System/Library/Frameworks/Addresses.framework/Versions
 %dir %{_prefix}/System/Library/Frameworks/Addresses.framework/Versions/A
-%attr(755,root,root) %{_prefix}/System/Library/Frameworks/Addresses.framework/Versions/A/ix86
-%{_prefix}/System/Library/Frameworks/Addresses.framework/Versions/A/Headers
+%attr(755,root,root) %{_prefix}/System/Library/Frameworks/Addresses.framework/Versions/A/%{gscpu}
 %dir %{_prefix}/System/Library/Frameworks/Addresses.framework/Versions/A/Resources
 %{_prefix}/System/Library/Frameworks/Addresses.framework/Versions/A/Resources/*.plist
 %{_prefix}/System/Library/Frameworks/Addresses.framework/Versions/A/Resources/English.lproj
+%lang(nl) %{_prefix}/System/Library/Frameworks/Addresses.framework/Versions/A/Resources/Dutch.lproj
+%lang(fr) %{_prefix}/System/Library/Frameworks/Addresses.framework/Versions/A/Resources/French.lproj
 %lang(de) %{_prefix}/System/Library/Frameworks/Addresses.framework/Versions/A/Resources/German.lproj
+%lang(es) %{_prefix}/System/Library/Frameworks/Addresses.framework/Versions/A/Resources/Spanish.lproj
+
 %{_prefix}/System/Library/Frameworks/Addresses.framework/Versions/Current
-%{_prefix}/System/Library/Frameworks/Addresses.framework/Resources
-%{_prefix}/System/Library/Frameworks/Addresses.framework/Headers
 %dir %{_prefix}/System/Library/Frameworks/AddressView.framework
+%{_prefix}/System/Library/Frameworks/AddressView.framework/Resources
 %dir %{_prefix}/System/Library/Frameworks/AddressView.framework/Versions
 %dir %{_prefix}/System/Library/Frameworks/AddressView.framework/Versions/A
-%attr(755,root,root) %{_prefix}/System/Library/Frameworks/AddressView.framework/Versions/A/ix86
-%{_prefix}/System/Library/Frameworks/AddressView.framework/Versions/A/Headers
-%{_prefix}/System/Library/Frameworks/AddressView.framework/Versions/A/Resources
+%attr(755,root,root) %{_prefix}/System/Library/Frameworks/AddressView.framework/Versions/A/%{gscpu}
+%dir %{_prefix}/System/Library/Frameworks/AddressView.framework/Versions/A/Resources
+%{_prefix}/System/Library/Frameworks/AddressView.framework/Versions/A/Resources/*.dict
 %{_prefix}/System/Library/Frameworks/AddressView.framework/Versions/A/Resources/*.plist
 %{_prefix}/System/Library/Frameworks/AddressView.framework/Versions/A/Resources/*.tiff
 %{_prefix}/System/Library/Frameworks/AddressView.framework/Versions/A/Resources/English.lproj
+%lang(nl) %{_prefix}/System/Library/Frameworks/AddressView.framework/Versions/A/Resources/Dutch.lproj
+%lang(fr) %{_prefix}/System/Library/Frameworks/AddressView.framework/Versions/A/Resources/French.lproj
 %lang(de) %{_prefix}/System/Library/Frameworks/AddressView.framework/Versions/A/Resources/German.lproj
+%lang(es) %{_prefix}/System/Library/Frameworks/AddressView.framework/Versions/A/Resources/Spanish.lproj
 %{_prefix}/System/Library/Frameworks/AddressView.framework/Versions/Current
-%{_prefix}/System/Library/Frameworks/AddressView.framework/Resources
+
+%attr(755,root,root) %{_prefix}/System/Library/Libraries/%{gscpu}/%{gsos}/%{libcombo}/*.so.*
+
+%files devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_prefix}/System/Library/Libraries/%{gscpu}/%{gsos}/%{libcombo}/*.so
+%{_prefix}/System/Library/Frameworks/Addresses.framework/Headers
+%{_prefix}/System/Library/Frameworks/Addresses.framework/Versions/A/Headers
 %{_prefix}/System/Library/Frameworks/AddressView.framework/Headers
-%attr(755,root,root) %{_prefix}/System/Library/Libraries/ix86/linux-gnu/gnu-gnu-gnu/*
-%{_prefix}/System/Library/Headers/gnu-gnu-gnu/Addresses
-%{_prefix}/System/Library/Headers/gnu-gnu-gnu/AddressView
-%attr(755,root,root) %{_prefix}/System/Tools/ix86/linux-gnu/gnu-gnu-gnu/*
-%dir %{_prefix}/System/Applications/AddressManager.app
-%attr(755,root,root) %{_prefix}/System/Applications/AddressManager.app/ix86
-%attr(755,root,root) %{_prefix}/System/Applications/AddressManager.app/AddressManager
-%dir %{_prefix}/System/Applications/AddressManager.app/Resources
-%{_prefix}/System/Applications/AddressManager.app/Resources/*.plist
-%{_prefix}/System/Applications/AddressManager.app/Resources/*.desktop
-%{_prefix}/System/Applications/AddressManager.app/Resources/*.tiff
-%{_prefix}/System/Applications/AddressManager.app/Resources/English.lproj
-%lang(de) %{_prefix}/System/Applications/AddressManager.app/Resources/German.lproj
+%{_prefix}/System/Library/Frameworks/AddressView.framework/Versions/A/Headers
+%{_prefix}/System/Library/Headers/%{libcombo}/Addresses
+%{_prefix}/System/Library/Headers/%{libcombo}/AddressView