- fix problems with autoconf 2.60 which creates configure that runs in POSIX mode

[packages/QtCurve.git] / QtCurve.spec

diff --git a/QtCurve.spec b/QtCurve.spec
index 4eff180e1a11baf00129e67a4c9917005c66e235..0b0f790b58154477db5e93ce0d5c335188ec812d 100644 (file)
--- a/QtCurve.spec
+++ b/QtCurve.spec
@@ -1,20 +1,28 @@
 #
+# ToDo:
+#  - include /usr/share/themes/QtCurve/mozilla somewhere
+#
 # Conditional build:
-%bcond_without gtk     # do not build GTK+(2) styles
+%bcond_with    gtk     # build GTK styles
+%bcond_without gtk2    # don't build GTK+2 styles
 #
 Summary:       A free and corrected port of Red Hat's GTK+/Qt theme
 Summary(pl):   Darmowa i poprawiona wersja motywu GTK+/Qt zrobionego przez Red Hata
 Name:          QtCurve
-Version:       0.34
+Version:       0.38
 Release:       1
 License:       GPL
 Group:         Themes
 Source0:       http://www.cpdrummond.freeuk.com/%{name}-%{version}.tar.gz
-# Source0-md5: fe712471bc69bf127201e85c3a53f49d
-#Patch0:               %{name}-gcc34.patch
-URL:           http://www.kde-look.org/content/show.php?content=5065
+# Source0-md5: 1e9145e20e2df5a1f572767d158f66d5
+URL:           http://www.kde-look.org/content/show.php?content=40492
+BuildRequires: autoconf
 BuildRequires: automake
+%{?with_gtk:BuildRequires:     gtk+-devel}
+%{?with_gtk2:BuildRequires:    gtk+2-devel}
 BuildRequires: kdelibs-devel >= 3.1
+BuildRequires: pkgconfig
+BuildRequires: sed > 4.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -40,7 +48,6 @@ Wersja pod KDE.
 Summary:       A free and corrected port of Red Hat's GTK+/Qt theme
 Summary(pl):   Darmowa i poprawiona wersja motywu GTK+/Qt zrobionego przez Red Hata
 Group:         Themes
-Requires:      gtk+
 Requires:      theme-QtCurve-common = %{version}-%{release}
 
 %description -n gtk-theme-QtCurve
@@ -54,7 +61,6 @@ Wersja pod GTK+.
 Summary:       A free and corrected port of Red Hat's GTK+/Qt theme
 Summary(pl):   Darmowa i poprawiona wersja motywu GTK+/Qt zrobionego przez Red Hata
 Group:         Themes
-Requires:      gtk+
 Requires:      theme-QtCurve-common = %{version}-%{release}
 
 %description -n gtk2-theme-QtCurve
@@ -84,15 +90,15 @@ Pakiet z dokumentacja i plikami wsp
 
 %prep
 %setup -q
-#`%patch0 -p1
+sed -i "s#/lib/gtk/#/%{_lib}/gtk/#g" gtk/Makefile.am
+sed -i "s#/lib/gtk-2.0/#/%{_lib}/gtk-2.0/#g" gtk2/Makefile.am
 
 %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} -f admin/Makefile.common cvs
+%configure \
+       --with-qt-libraries=%{_libdir}
 
 %{__make}
 
@@ -121,14 +127,16 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/gtk/themes/engines/*.so
 %{_datadir}/themes/QtCurve*/gtk
+%endif
 
+%if %{with gtk2}
 %files -n gtk2-theme-QtCurve
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/gtk-2.0/*/*/*.so
 %{_datadir}/themes/QtCurve*/gtk-2.0
+%endif
 
 %files -n theme-QtCurve-common
 %defattr(644,root,root,755)
 %doc ChangeLog README TODO
 %dir %{_datadir}/themes/QtCurve*
-%endif