- clean buildroot before install, not build

[packages/Addresses.git] / Addresses.spec

diff --git a/Addresses.spec b/Addresses.spec
index 8fc4ee427909e5a0a8181334b47e657109f87509..17c0f3c3d2a5d395d642781a0394969cb686cc98 100644 (file)
--- a/Addresses.spec
+++ b/Addresses.spec
@@ -1,13 +1,12 @@
 Summary:       Contact manager for GNUstep
 Summary(pl):   Zarz±dca kontaktów dla GNUstepa
 Name:          Addresses
-Version:       0.3.3
+Version:       0.4.4
 Release:       1
 License:       GPL
 Group:         X11/Applications
 Source0:       http://giesler.biz/bjoern/Downloads/%{name}/%{name}-%{version}.tar.gz
-# Source0-md5: 9830e81ab3ad4c8d41b5e360f473e190
-Patch0:        %{name}-installer.patch
+# Source0-md5: 9ace064497b4775e2a451f39430ac107
 URL:           http://giesler.biz/bjoern/English/Software.html#Addresses
 BuildRequires: gnustep-gui-devel >= 0.8.3
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -32,29 +31,23 @@ aplikacji GNUstepa.
 
 %prep
 %setup -q 
-%patch -p1
 
 find . -type d -name CVS | xargs rm -rf
 
 %build
-rm -rf $RPM_BUILD_ROOT
 . %{_prefix}/System/Library/Makefiles/GNUstep.sh
 TOPDIR="`pwd`"
 GNUSTEP_LOCAL_ROOT="$RPM_BUILD_ROOT%{_prefix}/System"
-ln -s AddressesFramework AddressBook
-for I in AddressesFramework \
-       AddressViewFramework \
-       GNUMailConverter \
-       AddressManager \
-       addresstool; do
-       %{__make} -C "$I" \
+%{__make} \
        OPTFLAG="%{rpmcflags} -I$RPM_BUILD_DIR/%{name}-%{version}" \
        debug=no \
        messages=yes
-       make -C "$I" install GNUSTEP_INSTALLATION_DIR="$RPM_BUILD_ROOT%{_prefix}/System"
-done
 
 %install
+rm -rf $RPM_BUILD_ROOT
+
+%{__make} install \
+       GNUSTEP_INSTALLATION_DIR="$RPM_BUILD_ROOT%{_prefix}/System"
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -66,7 +59,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc TODO
 
-
 %dir %{_prefix}/System/Library/Frameworks/Addresses.framework
 %dir %{_prefix}/System/Library/Frameworks/Addresses.framework/Versions
 %dir %{_prefix}/System/Library/Frameworks/Addresses.framework/Versions/A