- updated to 0.8.3, many fixes and cleanups - builds

Changed files:
    gnustep-gui.spec -> 1.14

diff --git a/gnustep-gui.spec b/gnustep-gui.spec
index 9b494b5687e3fbd7564018b9c287e50df1c1358a..acdac730ad4098a41288dc5df330acbf1412e760 100644 (file)
--- a/gnustep-gui.spec
+++ b/gnustep-gui.spec
@@ -1,17 +1,33 @@
 Summary:       GNUstep GUI library package
 Summary(pl):   Biblioteka GNUstep GUI
 Name:          gnustep-gui
-Version:       0.7.0
+Version:       0.8.3
 Release:       1
-License:       GPL
-Vendor:                The Seawood Project
+License:       LGPL/GPL
+Vendor:                The GNUstep Project
 Group:         Development/Tools
 Source0:       ftp://ftp.gnustep.org/pub/gnustep/core/%{name}-%{version}.tar.gz
-Patch0:                gstep-gui-headers.patch
 URL:           http://www.gnustep.org/
-BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-Conflicts:     gnustep-core
+BuildRequires: audiofile-devel
+BuildRequires: gcc-objc
+BuildRequires: gnustep-base-devel
+BuildRequires: libjpeg-devel
+BuildRequires: libtiff-devel
+BuildRequires: zlib-devel
 Requires:      gnustep-base
+Conflicts:     gnustep-core
+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           %{_target_cpu}
+%endif
 
 %description
 It is a library of graphical user interface classes written completely
@@ -23,8 +39,6 @@ include graphical objects such as buttons, text fields, popup lists,
 browser lists, and windows; there are also many associated classes for
 handling events, colors, fonts, pasteboards and images.
 
-Library combo is %{libcombo}. %{_buildblurb}
-
 %description -l pl
 To jest biblioteka klas graficznego interfejsu u¿ytkownika napisana w
 Objective-C. Klasy bazuj± na specyfikacji OpenStep wypuszczonej przez
@@ -38,67 +52,47 @@ obs
 Summary:       GNUstep GUI headers and libs
 Summary(pl):   Pliki nag³ówkowe GNUstep GUI
 Group:         Development/Libraries
-Requires:      %{name} = %{version}, gnustep-base-devel
+Requires:      %{name} = %{version}
+Requires:      audiofile-devel
+Requires:      gnustep-base-devel
+Requires:      libjpeg-devel
+Requires:      libtiff-devel
 Conflicts:     gnustep-core
 
 %description devel
 Header files required to build applications against the GNUstep GUI
-library. Library combo is %{libcombo}. %{_buildblurb}
+library.
 
 %description devel -l pl
 Pliki nag³ówkowe potrzebne do budowania aplikacji korzystaj±cych z
 biblioteki GNUstep GUI.
 
 %prep
-%setup -q -n gstep-%{ver}/gui
-%patch -p2
+%setup -q
 
 %build
-if [ -z "$GNUSTEP_SYSTEM_ROOT" ]; then
-   . %{_prefix}/GNUstep/Makefiles/GNUstep.sh
-fi
-CFLAGS="%{rpmcflags}" ./configure --prefix=%{_prefix}/GNUstep --with-library-combo=%{libcombo}
-%{__make}
-
-%install
-rm -rf $RPM_BUILD_ROOT
-if [ -z "$GNUSTEP_SYSTEM_ROOT" ]; then
-   . %{_prefix}/GNUstep/Makefiles/GNUstep.sh
-fi
-install -d ${RPM_BUILD_ROOT}%{_prefix}/GNUstep/Library/Services
-
-%{__make} install GNUSTEP_INSTALLATION_DIR=${RPM_BUILD_ROOT}%{_prefix}/GNUstep
-
-cat > filelist.rpm.in << EOF
-%defattr (-, bin, bin)
-%doc ANNOUNCE COPYING* ChangeLog INSTALL NEWS NOTES README SUPPORT Version
+. %{_prefix}/System/Makefiles/GNUstep.sh
+%configure
 
-%dir %{_prefix}/GNUstep/Library
+%{__make} \
+       messages=yes
 
-%{_prefix}/GNUstep/Libraries/GSARCH/GSOS/%{libcombo}/lib*.so.*
-%{_prefix}/GNUstep/Libraries/Resources
-%{_prefix}/GNUstep/Library/Model
-%{_prefix}/GNUstep/Library/Services/*
-%{_prefix}/GNUstep/Tools/make_services
-%{_prefix}/GNUstep/Tools/set_show_service
-# gpbs is now provided by xgps
-#%{_prefix}/GNUstep/Tools/GSARCH/GSOS/%{libcombo}/gpbs
-%{_prefix}/GNUstep/Tools/GSARCH/GSOS/%{libcombo}/make_services
-%{_prefix}/GNUstep/Tools/GSARCH/GSOS/%{libcombo}/set_show_service
+%{__make} -C Documentation
 
-EOF
-
-cat > filelist-devel.rpm.in  << EOF
-%defattr(-, root, root)
-%{_prefix}/GNUstep/Headers/gnustep/gui
-%{_prefix}/GNUstep/Libraries/GSARCH/GSOS/%{libcombo}/lib*.so
+%install
+rm -rf $RPM_BUILD_ROOT
+. %{_prefix}/System/Makefiles/GNUstep.sh
 
-EOF
+%{__make} install \
+       GNUSTEP_INSTALLATION_DIR=$RPM_BUILD_ROOT%{_prefix}/System \
+       INSTALL_ROOT_DIR=$RPM_BUILD_ROOT
 
-sed -e "s|GSARCH|${GNUSTEP_HOST_CPU}|" -e "s|GSOS|${GNUSTEP_HOST_OS}|" < filelist.rpm.in > filelist.rpm
-sed -e "s|GSARCH|${GNUSTEP_HOST_CPU}|" -e "s|GSOS|${GNUSTEP_HOST_OS}|" < filelist-devel.rpm.in > filelist-devel.rpm
+%{__make} install -C Documentation \
+       GNUSTEP_INSTALLATION_DIR=$RPM_BUILD_ROOT%{_prefix}/System
 
-# Don't worry about ld.so.conf on linux as gnustep-base should take care of it.
+# not (yet?) supported by rpm-compress-doc
+find $RPM_BUILD_ROOT%{_prefix}/System/Documentation \
+       -type f -a ! -name '*.html' | xargs gzip -9nf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -106,8 +100,66 @@ rm -rf $RPM_BUILD_ROOT
 %post   -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
-%files -f filelist.rpm
+%files
 %defattr(644,root,root,755)
-
-%files -f filelist-devel.rpm devel
+%doc ChangeLog
+
+%{_prefix}/System/Documentation/Developer/Gui
+%{_prefix}/System/Documentation/info/*.info*
+
+%{_prefix}/System/Libraries/Resources/English.lproj/*
+%{_prefix}/System/Libraries/Resources/Images
+%{_prefix}/System/Libraries/Resources/KeyBindings
+%dir %{_prefix}/System/Libraries/Resources/PrinterTypes
+%{_prefix}/System/Libraries/Resources/PrinterTypes/GSProlog.ps
+%{_prefix}/System/Libraries/Resources/PrinterTypes/Printers
+%{_prefix}/System/Libraries/Resources/PrinterTypes/English.lproj
+%lang(fr) %{_prefix}/System/Libraries/Resources/PrinterTypes/French.lproj
+%lang(de) %{_prefix}/System/Libraries/Resources/PrinterTypes/German.lproj
+%lang(it) %{_prefix}/System/Libraries/Resources/PrinterTypes/Italian.lproj
+%lang(es) %{_prefix}/System/Libraries/Resources/PrinterTypes/Spanish.lproj
+%lang(sv) %{_prefix}/System/Libraries/Resources/PrinterTypes/Swedish.lproj
+%dir %{_prefix}/System/Libraries/Resources/gnustep-gui
+%dir %{_prefix}/System/Libraries/Resources/gnustep-gui/Resources
+%{_prefix}/System/Libraries/Resources/gnustep-gui/Resources/English.lproj
+%lang(it) %{_prefix}/System/Libraries/Resources/gnustep-gui/Resources/Italian.lproj
+
+%{_prefix}/System/Libraries/%{gscpu}/%{gsos}/%{libcombo}/lib*.so.*
+
+%dir %{_prefix}/System/Library/Bundles/TextConverters
+%dir %{_prefix}/System/Library/Bundles/TextConverters/RTFConverter.bundle
+%{_prefix}/System/Library/Bundles/TextConverters/RTFConverter.bundle/Resources
+%attr(755,root,root) %{_prefix}/System/Library/Bundles/TextConverters/RTFConverter.bundle/%{gscpu}
+%dir %{_prefix}/System/Library/Bundles/libgmodel.bundle
+%{_prefix}/System/Library/Bundles/libgmodel.bundle/Resources
+%attr(755,root,root) %{_prefix}/System/Library/Bundles/libgmodel.bundle/%{gscpu}
+%dir %{_prefix}/System/Library/ColorPickers
+%dir %{_prefix}/System/Library/ColorPickers/StandardPicker.bundle
+%dir %{_prefix}/System/Library/ColorPickers/StandardPicker.bundle/Resources
+%{_prefix}/System/Library/ColorPickers/StandardPicker.bundle/Resources/*.tiff
+%{_prefix}/System/Library/ColorPickers/StandardPicker.bundle/Resources/*.plist
+%{_prefix}/System/Library/ColorPickers/StandardPicker.bundle/Resources/English.lproj
+%lang(fr) %{_prefix}/System/Library/ColorPickers/StandardPicker.bundle/Resources/French.lproj
+%lang(sv) %{_prefix}/System/Library/ColorPickers/StandardPicker.bundle/Resources/Swedish.lproj
+%attr(755,root,root) %{_prefix}/System/Library/ColorPickers/StandardPicker.bundle/%{gscpu}
+%dir %{_prefix}/System/Library/ColorPickers/WheelPicker.bundle
+%{_prefix}/System/Library/ColorPickers/WheelPicker.bundle/Resources
+%attr(755,root,root) %{_prefix}/System/Library/ColorPickers/WheelPicker.bundle/%{gscpu}
+
+%{_prefix}/System/Library/Model
+
+%dir %{_prefix}/System/Library/Services/GSspell.service
+%{_prefix}/System/Library/Services/GSspell.service/Resources
+%attr(755,root,root) %{_prefix}/System/Library/Services/GSspell.service
+%dir %{_prefix}/System/Library/Services/example.service
+%{_prefix}/System/Library/Services/example.service/Resources
+%attr(755,root,root) %{_prefix}/System/Library/Services/example.service/%{gscpu}
+
+%attr(755,root,root) %{_prefix}/System/Tools/%{gscpu}/%{gsos}/%{libcombo}/*
+
+%files devel
 %defattr(644,root,root,755)
+%{_prefix}/System/Headers/AppKit
+%{_prefix}/System/Headers/gnustep/AppKit
+%{_prefix}/System/Libraries/%{gscpu}/%{gsos}/%{libcombo}/lib*.so
+%{_prefix}/System/Makefiles/Additional/gui.make