X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=QtCurve.spec;h=7a6620ae3596c01e1587685671fdcc4dd0ac2c95;hb=c50c9c1e09ceda0c922ca468136dce77ecdd3272;hp=30bd9a8ced2673422733340d81bc0ebba4376866;hpb=2113d1a07616b88c52c457f2fcfcafa7e9f0b858;p=packages%2FQtCurve.git

diff --git a/QtCurve.spec b/QtCurve.spec
index 30bd9a8..7a6620a 100644
--- a/QtCurve.spec
+++ b/QtCurve.spec
@@ -1,17 +1,19 @@
-
-%bcond_without gtk	# do not build gtk+(2) styles
-
+#
+# Conditional build:
+%bcond_without	gtk	# do not build gtk+(2) styles
+#
 Summary:	A free and corrected port of Redhats gtk/qt theme
 Summary(pl):	Darmowa i poprawiona wersja tematu gtk/qt zrobionego przez Redhata
 Name:		QtCurve
-Version:	0.18
-Release:	1
+Version:	0.19
+Release:	2
 License:	GPL
 Group:		Themes
-# from		http://www.kde-look.org/content/download.php?content=5065&id=1
-Source0:	%{name}-%{version}.tar.gz
-# Source0-md5:	b42974ade8866c1b00808af9f0e47d61
+Source0:	http://www.cpdrummond.freeuk.com/%{name}-%{version}.tar.gz
+# Source0-md5:	d7b8addee47e7f9903a75f0ff3a3ecb6
+Patch0:		%{name}-gcc34.patch
 URL:		http://www.kde-look.org/content/show.php?content=5065
+BuildRequires:  automake
 BuildRequires:	kdelibs-devel >= 3.1
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -39,8 +41,7 @@ Summary:	A free and corrected port of Redhat's gtk/qt theme
 Summary(pl):	Darmowa i poprawiona wersja motywu gtk/qt zrobionego przez Redhata
 Group:		Themes
 Requires:	gtk+
-Requires:	theme-QtCurve-common
-
+Requires:	theme-QtCurve-common = %{version}-%{release}
 
 %description -n gtk-theme-QtCurve
 A free and corrected port of Redhat's gtk/qt theme. gtk version.
@@ -54,8 +55,7 @@ Summary:	A free and corrected port of Redhat's gtk/qt theme
 Summary(pl):	Darmowa i poprawiona wersja motywu gtk/qt zrobionego przez Redhata
 Group:		Themes
 Requires:	gtk+
-Requires:	theme-QtCurve-common
-
+Requires:	theme-QtCurve-common = %{version}-%{release}
 
 %description -n gtk2-theme-QtCurve
 A free and corrected port of Redhat's gtk/qt theme. gtk2 version.
@@ -74,7 +74,6 @@ Obsoletes:	gtk-theme-bluecurve
 Obsoletes:	kde-style-bluecurve
 Obsoletes:	kde-theme-bluecurve
 
-
 %description -n theme-QtCurve-common
 A free and corrected port of Redhats gtk/qt theme.
 Documentation and common files package.
@@ -85,12 +84,14 @@ Pakiet z dokumentacja i plikami wsp
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 cp /usr/share/automake/config.sub admin
 
 %{!?with_gtk:export "DO_NOT_COMPILE=gtk gtk2"}
-
+##export UNSERMAKE=/usr/share/unsermake/unsermake
+##%{__make} -f admin/Makefile.common cvs
 %configure
 
 %{__make}
@@ -101,6 +102,8 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+rm -f $RPM_BUILD_ROOT{%{_libdir}/gtk/themes/engines,%{_libdir}/gtk-2.0/*/*}/*.la
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -115,13 +118,11 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with gtk}
 %files -n gtk-theme-QtCurve
 %defattr(644,root,root,755)
-%{_libdir}/gtk/themes/engines/*.la
 %attr(755,root,root) %{_libdir}/gtk/themes/engines/*.so
 %{_datadir}/themes/QtCurve*/gtk
 
 %files -n gtk2-theme-QtCurve
 %defattr(644,root,root,755)
-%{_libdir}/gtk-2.0/*/*/*.la
 %attr(755,root,root) %{_libdir}/gtk-2.0/*/*/*.so
 %{_datadir}/themes/QtCurve*/gtk-2.0