- builds (ugly!)

Changed files:
    Addresses-installer.patch -> 1.1
    Addresses.spec -> 1.3

diff --git a/Addresses-installer.patch b/Addresses-installer.patch
new file mode 100644 (file)
index 0000000..564c851
--- /dev/null
+++ b/Addresses-installer.patch
@@ -0,0 +1,15 @@
+diff -ur Addresses-0.3.3-orig/AddressManager/GNUmakefile.preamble Addresses-0.3.3/AddressManager/GNUmakefile.preamble
+--- Addresses-0.3.3-orig/AddressManager/GNUmakefile.preamble   2003-10-16 02:53:31.000000000 -0600
++++ Addresses-0.3.3/AddressManager/GNUmakefile.preamble        2003-10-17 00:01:57.000000000 -0600
+@@ -30,10 +30,3 @@
+ ADDITIONAL_TOOL_LIBS +=
+ # WebObjects
+ ADDITIONAL_WO_LIBS +=
+-
+-# Additional directories to be created during installation
+-ADDITIONAL_INSTALL_DIRS += \
+-      $(GNUSTEP_USER_ROOT)/Library/Preferences \
+-      $(GNUSTEP_LOCAL_ROOT)/Library/Preferences \
+-      $(GNUSTEP_NETWORK_ROOT)/Library/Preferences \
+-      $(GNUSTEP_SYSTEM_ROOT)/Library/Preferences
+Only in Addresses-0.3.3/AddressManager: GNUmakefile.preamble~

diff --git a/Addresses.spec b/Addresses.spec
index 15f5b53e78ff31841e755c1092b37123c762e85a..8fc4ee427909e5a0a8181334b47e657109f87509 100644 (file)
--- a/Addresses.spec
+++ b/Addresses.spec
@@ -1,12 +1,13 @@
 Summary:       Contact manager for GNUstep
 Summary(pl):   Zarz±dca kontaktów dla GNUstepa
 Name:          Addresses
-Version:       0.3.1
+Version:       0.3.3
 Release:       1
 License:       GPL
 Group:         X11/Applications
 Source0:       http://giesler.biz/bjoern/Downloads/%{name}/%{name}-%{version}.tar.gz
-# Source0-md5: 426ddc37e11cc09aca78965aace3f91d
+# Source0-md5: 9830e81ab3ad4c8d41b5e360f473e190
+Patch0:        %{name}-installer.patch
 URL:           http://giesler.biz/bjoern/English/Software.html#Addresses
 BuildRequires: gnustep-gui-devel >= 0.8.3
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -31,6 +32,7 @@ aplikacji GNUstepa.
 
 %prep
 %setup -q 
+%patch -p1
 
 find . -type d -name CVS | xargs rm -rf
 
@@ -38,17 +40,18 @@ find . -type d -name CVS | xargs rm -rf
 rm -rf $RPM_BUILD_ROOT
 . %{_prefix}/System/Library/Makefiles/GNUstep.sh
 TOPDIR="`pwd`"
-GNUSTEP_LOCAL_ROOT="$RPM_BUILD_DIR/%{_prefix}/lib/GNUstep"
+GNUSTEP_LOCAL_ROOT="$RPM_BUILD_ROOT%{_prefix}/System"
+ln -s AddressesFramework AddressBook
 for I in AddressesFramework \
        AddressViewFramework \
        GNUMailConverter \
        AddressManager \
        addresstool; do
        %{__make} -C "$I" \
-       OPTFLAG="%{rpmcflags}" \
+       OPTFLAG="%{rpmcflags} -I$RPM_BUILD_DIR/%{name}-%{version}" \
        debug=no \
        messages=yes
-       make -C "$I" install GNUSTEP_INSTALLATION_DIR="$RPM_BUILD_DIR/%{_prefix}/lib/GNUstep"
+       make -C "$I" install GNUSTEP_INSTALLATION_DIR="$RPM_BUILD_ROOT%{_prefix}/System"
 done
 
 %install
@@ -61,18 +64,44 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc TODO Documentation/*.ps
+%doc TODO
 
-%dir %{_prefix}/System/Applications/Contacts.app
-%attr(755,root,root) %{_prefix}/System/Applications/Contacts.app/Contacts
-%dir %{_prefix}/System/Applications/Contacts.app/Resources
-%{_prefix}/System/Applications/Contacts.app/Resources/*.desktop
-%{_prefix}/System/Applications/Contacts.app/Resources/*.plist
-%{_prefix}/System/Applications/Contacts.app/Resources/*.tiff
-%{_prefix}/System/Applications/Contacts.app/Resources/*.gorm
 
-%dir %{_prefix}/System/Applications/Contacts.app/%{gscpu}
-%dir %{_prefix}/System/Applications/Contacts.app/%{gscpu}/%{gsos}
-%dir %{_prefix}/System/Applications/Contacts.app/%{gscpu}/%{gsos}/%{libcombo}
-%attr(755,root,root) %{_prefix}/System/Applications/Contacts.app/%{gscpu}/%{gsos}/%{libcombo}/Contacts
-%{_prefix}/System/Applications/Contacts.app/%{gscpu}/%{gsos}/%{libcombo}/*.openapp
+%dir %{_prefix}/System/Library/Frameworks/Addresses.framework
+%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
+%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(de) %{_prefix}/System/Library/Frameworks/Addresses.framework/Versions/A/Resources/German.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
+%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
+%{_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(de) %{_prefix}/System/Library/Frameworks/AddressView.framework/Versions/A/Resources/German.lproj
+%{_prefix}/System/Library/Frameworks/AddressView.framework/Versions/Current
+%{_prefix}/System/Library/Frameworks/AddressView.framework/Resources
+%{_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