- updated to 0.45 (0.42 for Gtk1);

- NOTE: From 0.39 onwards the KDE and Gtk styles will be in separate archives.

Changed files:
    QtCurve.spec -> 1.40

diff --git a/QtCurve.spec b/QtCurve.spec
index 0b0f790b58154477db5e93ce0d5c335188ec812d..b02547ee6928e84138a87092e7f585b675ff75c1 100644 (file)
--- a/QtCurve.spec
+++ b/QtCurve.spec
@@ -6,21 +6,30 @@
 %bcond_with    gtk     # build GTK styles
 %bcond_without gtk2    # don't build GTK+2 styles
 #
+%define                kde_ver         0.45.2
+%define                gtk2_ver        0.45.3
+%define                gtk1_ver        0.42.2
 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.38
+Version:       0.45
 Release:       1
 License:       GPL
 Group:         Themes
-Source0:       http://www.cpdrummond.freeuk.com/%{name}-%{version}.tar.gz
-# Source0-md5: 1e9145e20e2df5a1f572767d158f66d5
+Source0:       http://home.freeuk.com/cpdrummond/%{name}-KDE3-%{kde_ver}.tar.gz
+# Source0-md5: be84b6d28bf88510952f1cf866647162
+Source1:       http://home.freeuk.com/cpdrummond/%{name}-Gtk2-%{gtk2_ver}.tar.gz
+# Source1-md5: 877c3a85c358689bd30af78951710d83
+Source2:       http://home.freeuk.com/cpdrummond/%{name}-Gtk1-%{gtk1_ver}.tar.gz
+# Source2-md5: 8219f58493ca4e65a8fe61ee76eca522
+Patch0:                %{name}-amd64.patch
 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: libtool
 BuildRequires: pkgconfig
 BuildRequires: sed > 4.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -89,11 +98,11 @@ Darmowa i poprawiona wersja motywu GTK+/Qt zrobionego przez Red Hata.
 Pakiet z dokumentacja i plikami wspó³dzielonymi.
 
 %prep
-%setup -q
-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
+%setup -q -c -a1 -a2
+%patch0 -p1
 
 %build
+cd %{name}-KDE3-%{kde_ver}
 cp /usr/share/automake/config.sub admin
 
 %{__make} -f admin/Makefile.common cvs
@@ -101,13 +110,48 @@ cp /usr/share/automake/config.sub admin
        --with-qt-libraries=%{_libdir}
 
 %{__make}
+cd -
+
+%if %{with gtk}
+cd %{name}-Gtk1-%{gtk1_ver}
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+%configure
+%{__make}
+cd -
+%endif
+
+%if %{with gtk2}
+cd %{name}-Gtk2-%{gtk2_ver}
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+%configure
+%{__make}
+cd -
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
+%{__make} -C %{name}-KDE3-%{kde_ver} install \
        DESTDIR=$RPM_BUILD_ROOT
 
+%if %{with gtk}
+%{__make} -C %{name}-Gtk1-%{gtk1_ver} install \
+       DESTDIR=$RPM_BUILD_ROOT
+%endif
+
+%if %{with gtk2}
+%{__make} -C %{name}-Gtk2-%{gtk2_ver} install \
+       DESTDIR=$RPM_BUILD_ROOT
+%endif
+
 rm -f $RPM_BUILD_ROOT{%{_libdir}/gtk/themes/engines,%{_libdir}/gtk-2.0/*/*}/*.la
 
 %clean
@@ -126,17 +170,17 @@ rm -rf $RPM_BUILD_ROOT
 %files -n gtk-theme-QtCurve
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/gtk/themes/engines/*.so
-%{_datadir}/themes/QtCurve*/gtk
+%{_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
+%{_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*
+%doc %{name}-KDE3-%{kde_ver}/{ChangeLog,README,TODO}
+%dir %{_datadir}/themes/QtCurve