Author: qboosh                       Date: Thu Dec 28 23:52:23 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated to 0.11.0, use flattened directory structure
- enabled gsnd (ready for portaudio 19 now)

---- Files affected:
SPECS:
   gnustep-gui.spec (1.44 -> 1.45) 

---- Diffs:

================================================================
Index: SPECS/gnustep-gui.spec
diff -u SPECS/gnustep-gui.spec:1.44 SPECS/gnustep-gui.spec:1.45
--- SPECS/gnustep-gui.spec:1.44 Sun Jan 15 22:59:24 2006
+++ SPECS/gnustep-gui.spec      Fri Dec 29 00:52:18 2006
@@ -1,13 +1,18 @@
 # $Revision$, $Date$
+#
+# Conditional build:
+%bcond_without cups            # GSCUPS bundle
+%bcond_without portaudio       # gsnd tool
+#
 Summary:       GNUstep GUI library package
 Summary(pl):   Biblioteka GNUstep GUI
 Name:          gnustep-gui
-Version:       0.10.2
+Version:       0.11.0
 Release:       1
 License:       LGPL/GPL
 Group:         Libraries
 Source0:       ftp://ftp.gnustep.org/pub/gnustep/core/%{name}-%{version}.tar.gz
-# Source0-md5: 0b8689f4d5178102740cc31fd97560bc
+# Source0-md5: 7821a516ce5f683885116d78ac09b79e
 Patch0:                %{name}-themes.patch
 Patch1:                %{name}-nocompressdocs.patch
 Patch2:                %{name}-segv.patch
@@ -15,26 +20,21 @@
 URL:           http://www.gnustep.org/
 BuildRequires: aspell-devel
 BuildRequires: audiofile-devel
+%{?with_cups:BuildRequires:    cups-devel}
 BuildRequires: gcc-objc
-BuildRequires: gnustep-base-devel >= 1.11.2
+BuildRequires: giflib-devel
+BuildRequires: gnustep-base-devel >= 1.13.0
 BuildRequires: libjpeg-devel
+BuildRequires: libpng-devel
 BuildRequires: libtiff-devel
+%{?with_portaudio:BuildRequires:       portaudio-devel >= 19}
 BuildRequires: zlib-devel
-Requires:      gnustep-base >= 1.11.2
+Requires:      gnustep-base >= 1.13.0
 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           %(echo %{_target_cpu} | sed -e 
's/amd64/x86_64/;s/ppc/powerpc/')
-%endif
-
 %description
 It is a library of graphical user interface classes written completely
 in the Objective-C language; the classes are based upon the OpenStep
@@ -60,7 +60,7 @@
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
 Requires:      audiofile-devel
-Requires:      gnustep-base-devel >= 1.11.2
+Requires:      gnustep-base-devel >= 1.13.0
 Requires:      libjpeg-devel
 Requires:      libtiff-devel
 Conflicts:     gnustep-core
@@ -82,10 +82,11 @@
 
 %build
 export GNUSTEP_MAKEFILES=%{_prefix}/System/Library/Makefiles
-export GNUSTEP_TARGET_DIR=%{gscpu}/linux-gnu
+export GNUSTEP_FLATTENED=yes
 # disable gsnd - not ready for current portaudio
 %configure \
-       --disable-gsnd
+       %{!?with_cups:--disable-cups} \
+       %{!?with_portaudio:--disable-gsnd}
 
 %{__make} \
        messages=yes
@@ -93,7 +94,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 export GNUSTEP_MAKEFILES=%{_prefix}/System/Library/Makefiles
-export GNUSTEP_TARGET_DIR=%{gscpu}/linux-gnu
+export GNUSTEP_FLATTENED=yes
 
 %{__make} install \
        GNUSTEP_INSTALLATION_DIR=$RPM_BUILD_ROOT%{_prefix}/System \
@@ -126,20 +127,29 @@
 %{_prefix}/System/Library/Documentation/User/Gui
 %{_prefix}/System/Library/Documentation/man/man1/*
 
+%dir %{_prefix}/System/Library/Bundles/GSPrinting
+%if %{with cups}
+# R: cups-lib - separate?
+%dir %{_prefix}/System/Library/Bundles/GSPrinting/GSCUPS.bundle
+%{_prefix}/System/Library/Bundles/GSPrinting/GSCUPS.bundle/Resources
+%{_prefix}/System/Library/Bundles/GSPrinting/GSCUPS.bundle/GSCUPS
+%endif
+%dir %{_prefix}/System/Library/Bundles/GSPrinting/GSLPR.bundle
+%{_prefix}/System/Library/Bundles/GSPrinting/GSLPR.bundle/Resources
+%{_prefix}/System/Library/Bundles/GSPrinting/GSLPR.bundle/GSLPR
+
 %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}
+%attr(755,root,root) 
%{_prefix}/System/Library/Bundles/TextConverters/RTFConverter.bundle/RTFConverter
 %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/Bundles/GSPrinting
-%dir %{_prefix}/System/Library/Bundles/GSPrinting/GSLPR.bundle
-%{_prefix}/System/Library/Bundles/GSPrinting/GSLPR.bundle/Resources
-%{_prefix}/System/Library/Bundles/GSPrinting/GSLPR.bundle/%{gscpu}
+%attr(755,root,root) 
%{_prefix}/System/Library/Bundles/libgmodel.bundle/libgmodel
 
 %dir %{_prefix}/System/Library/ColorPickers
+%dir %{_prefix}/System/Library/ColorPickers/NamedPicker.bundle
+%{_prefix}/System/Library/ColorPickers/NamedPicker.bundle/Resources
+%attr(755,root,root) 
%{_prefix}/System/Library/ColorPickers/NamedPicker.bundle/NamedPicker
 %dir %{_prefix}/System/Library/ColorPickers/StandardPicker.bundle
 %dir %{_prefix}/System/Library/ColorPickers/StandardPicker.bundle/Resources
 %{_prefix}/System/Library/ColorPickers/StandardPicker.bundle/Resources/*.tiff
@@ -147,13 +157,10 @@
 
%{_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/NamedPicker.bundle
-%{_prefix}/System/Library/ColorPickers/NamedPicker.bundle/Resources
-%attr(755,root,root) 
%{_prefix}/System/Library/ColorPickers/NamedPicker.bundle/%{gscpu}
+%attr(755,root,root) 
%{_prefix}/System/Library/ColorPickers/StandardPicker.bundle/StandardPicker
 %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}
+%attr(755,root,root) 
%{_prefix}/System/Library/ColorPickers/WheelPicker.bundle/WheelPicker
 
 %{_prefix}/System/Library/Images/*
 %{_prefix}/System/Library/KeyBindings/*.dict
@@ -161,9 +168,12 @@
 %dir %{_prefix}/System/Library/Libraries/Resources/gnustep-gui
 %{_prefix}/System/Library/Libraries/Resources/gnustep-gui/*.plist
 %{_prefix}/System/Library/Libraries/Resources/gnustep-gui/English.lproj
+%lang(eo) 
%{_prefix}/System/Library/Libraries/Resources/gnustep-gui/Esperanto.lproj
+%lang(de) 
%{_prefix}/System/Library/Libraries/Resources/gnustep-gui/German.lproj
 %lang(it) 
%{_prefix}/System/Library/Libraries/Resources/gnustep-gui/Italian.lproj
+%lang(jbo) 
%{_prefix}/System/Library/Libraries/Resources/gnustep-gui/Lojban.lproj
 
-%{_prefix}/System/Library/Libraries/%{gscpu}/%{gsos}/%{libcombo}/lib*.so.*
+%attr(755,root,root) %{_prefix}/System/Library/Libraries/libgnustep-gui.so.*
 
 %dir %{_prefix}/System/Library/PostScript
 %{_prefix}/System/Library/PostScript/GSProlog.ps
@@ -171,9 +181,9 @@
 %{_prefix}/System/Library/PostScript/PPD/English.lproj
 %dir %{_prefix}/System/Library/Services/GSspell.service
 %{_prefix}/System/Library/Services/GSspell.service/Resources
-%attr(755,root,root) 
%{_prefix}/System/Library/Services/GSspell.service/%{gscpu}
+%attr(755,root,root) %{_prefix}/System/Library/Services/GSspell.service/GSspell
 
-%attr(755,root,root) %{_prefix}/System/Tools/%{gscpu}/%{gsos}/%{libcombo}/*
+%attr(755,root,root) %{_prefix}/System/Tools/*
 
 %files devel
 %defattr(644,root,root,755)
@@ -184,11 +194,12 @@
 %{_prefix}/System/Library/Documentation/Developer/Gui/Reference
 %{_prefix}/System/Library/Documentation/info/gnustep-gui.info*
 
-%{_prefix}/System/Library/Headers/%{libcombo}/AppKit
-%{_prefix}/System/Library/Headers/%{libcombo}/GNUstepGUI
-%{_prefix}/System/Library/Headers/%{libcombo}/gnustep/gui
+%{_prefix}/System/Library/Headers/AppKit
+%{_prefix}/System/Library/Headers/Cocoa
+%{_prefix}/System/Library/Headers/GNUstepGUI
+%{_prefix}/System/Library/Headers/gnustep/gui
 
-%{_prefix}/System/Library/Libraries/%{gscpu}/%{gsos}/%{libcombo}/lib*.so
+%attr(755,root,root) %{_prefix}/System/Library/Libraries/libgnustep-gui.so
 %{_prefix}/System/Library/Makefiles/Additional/gui.make
 
 %define date   %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -197,6 +208,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.45  2006/12/28 23:52:18  qboosh
+- updated to 0.11.0, use flattened directory structure
+- enabled gsnd (ready for portaudio 19 now)
+
 Revision 1.44  2006/01/15 21:59:24  qboosh
 - updated to 0.10.2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/gnustep-gui.spec?r1=1.44&r2=1.45&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to