SPECS: QtCurve.spec - build gtk1 theme, add kde bcond; rel 2

[glen]

Author: glen                         Date: Wed Dec 12 19:43:44 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- build gtk1 theme, add kde bcond; rel 2

---- Files affected:
SPECS:
   QtCurve.spec (1.52 -> 1.53) 

---- Diffs:

================================================================
Index: SPECS/QtCurve.spec
diff -u SPECS/QtCurve.spec:1.52 SPECS/QtCurve.spec:1.53
--- SPECS/QtCurve.spec:1.52	Wed Dec 12 18:31:48 2007
+++ SPECS/QtCurve.spec	Wed Dec 12 20:43:39 2007
@@ -4,16 +4,18 @@
 # - gtk1 no longer updated. drop after dropping last gtk+ 1.x app
 #
 # Conditional build:
-%bcond_with	gtk	# build GTK+ styles
+%bcond_without	gtk	# build GTK+ styles
 %bcond_without	gtk2	# don't build GTK+2 styles
+%bcond_without	kde	# don't build KDE styles
 #
+%define		ver		0.55.1
 %define		kde_ver		0.55.1
 %define		gtk2_ver	0.55.1
 %define		gtk1_ver	0.42.2
 Summary:	A free and corrected port of Red Hat's GTK+/Qt theme
 Summary(pl.UTF-8):	Darmowa i poprawiona wersja motywu GTK+/Qt zrobionego przez Red Hata
 Name:		QtCurve
-Version:	0.55.1
+Version:	%{ver}
 Release:	2
 License:	GPL
 Group:		Themes
@@ -31,7 +33,7 @@
 BuildRequires:	cmake
 %{?with_gtk:BuildRequires:	gtk+-devel}
 %{?with_gtk2:BuildRequires:	gtk+2-devel}
-BuildRequires:	kdelibs-devel >= 3.1
+%{?with_kde:BuildRequires:	kdelibs-devel >= 3.1}
 BuildRequires:	libtool
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.293
@@ -60,8 +62,9 @@
 %package -n gtk-theme-QtCurve
 Summary:	A free and corrected port of Red Hat's GTK+/Qt theme
 Summary(pl.UTF-8):	Darmowa i poprawiona wersja motywu GTK+/Qt zrobionego przez Red Hata
+Version:	%{gtk1_ver}
 Group:		Themes
-Requires:	theme-QtCurve-common = %{version}-%{release}
+Requires:	theme-QtCurve-common = %{ver}-%{release}
 
 %description -n gtk-theme-QtCurve
 A free and corrected port of Red Hat's GTK+/Qt theme. GTK+ version.
@@ -73,8 +76,9 @@
 %package -n gtk2-theme-QtCurve
 Summary:	A free and corrected port of Red Hat's GTK+/Qt theme
 Summary(pl.UTF-8):	Darmowa i poprawiona wersja motywu GTK+/Qt zrobionego przez Red Hata
+Version:	%{gtk2_ver}
 Group:		Themes
-Requires:	theme-QtCurve-common = %{version}-%{release}
+Requires:	theme-QtCurve-common = %{ver}-%{release}
 
 %description -n gtk2-theme-QtCurve
 A free and corrected port of Red Hat's GTK+/Qt theme. GTK+2 version.
@@ -86,6 +90,7 @@
 %package -n theme-QtCurve-common
 Summary:	A free and corrected port of Redhats GTK+/Qt theme - common
 Summary(pl.UTF-8):	Darmowa i poprawiona wersja motywu GTK+/Qt zrobionego przez Red Hata - common
+Version:	%{kde_ver}
 Group:		Themes
 Obsoletes:	gtk-theme-bluecurve
 Obsoletes:	gtk2-theme-bluecurve
@@ -102,7 +107,7 @@
 Pakiet z dokumentacja i plikami współdzielonymi.
 
 %prep
-%setup -q -c %{?with_gtk2:-a1} %{?with_gtk:-a2}
+%setup -q -c -D %{?with_kde:-a0} %{?with_gtk2:-a1} %{?with_gtk:-a2}
 %if %{with gtk2}
 cd %{name}-Gtk2-%{gtk2_ver}
 %patch0 -p1
@@ -111,12 +116,14 @@
 %endif
 
 %build
+%if %{with kde}
 cd %{name}-KDE3-%{kde_ver}
 %cmake \
 	-DCMAKE_INSTALL_PREFIX=%{_prefix} \
 	.
 %{__make}
 cd -
+%endif
 
 %if %{with gtk}
 cd %{name}-Gtk1-%{gtk1_ver}
@@ -145,8 +152,10 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
+%if %{with kde}
 %{__make} -C %{name}-KDE3-%{kde_ver} install \
 	DESTDIR=$RPM_BUILD_ROOT
+%endif
 
 %if %{with gtk}
 %{__make} -C %{name}-Gtk1-%{gtk1_ver} install \
@@ -156,25 +165,26 @@
 %if %{with gtk2}
 %{__make} -C %{name}-Gtk2-%{gtk2_ver} install \
 	DESTDIR=$RPM_BUILD_ROOT
-%endif
 
 chmod a+x $RPM_BUILD_ROOT%{_datadir}/themes/QtCurve/gtk-2.0/map_kde_icons.pl
 chmod a+x $RPM_BUILD_ROOT%{_datadir}/themes/QtCurve/mozilla/mailto.sh
+%endif
 
 rm -f $RPM_BUILD_ROOT{%{_libdir}/gtk/themes/engines,%{_libdir}/gtk-2.0/*/*}/*.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%if %{with kde}
 %files -n kde-style-QtCurve
 %defattr(644,root,root,755)
 %{_libdir}/kde3/kstyle_qtcurve_config.la
 %attr(755,root,root) %{_libdir}/kde3/kstyle_qtcurve_config.so
-#%{_libdir}/kde3/plugins/styles/*.la
 %attr(755,root,root) %{_libdir}/kde3/plugins/styles/*.so
 %{_datadir}/apps/kstyle/themes/qtcurve*.themerc
 %{_datadir}/apps/kstyle/themes/qtc_klearlooks.themerc
 %{_datadir}/apps/QtCurve
+%endif
 
 %if %{with gtk}
 %files -n gtk-theme-QtCurve
@@ -210,6 +220,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.53  2007-12-12 19:43:39  glen
+- build gtk1 theme, add kde bcond; rel 2
+
 Revision 1.52  2007-12-12 17:31:48  qboosh
 - gtk+ 1.x themes should exist as long as any gtk+ 1.x app exist
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/QtCurve.spec?r1=1.52&r2=1.53&f=u