- rm tabs

[packages/QtCurve.git] / QtCurve.spec

diff --git a/QtCurve.spec b/QtCurve.spec
index 8249cc66d8c4905ea6da3635d6d0fb66078bc834..6455d26e368655f0ad2dfe915523b3513cb1b0ab 100644 (file)
--- a/QtCurve.spec
+++ b/QtCurve.spec
@@ -7,25 +7,26 @@
 %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                ver             0.59.5
+%define                kde_ver         0.59.5
+%define                gtk2_ver        0.59.7
 %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:       %{ver}
-Release:       4
+Release:       1
 License:       GPL
 Group:         Themes
 Source0:       http://home.freeuk.com/cpdrummond/%{name}-KDE3-%{kde_ver}.tar.bz2
-# Source0-md5: 1ba394626a40e8926966739500dbf87d
+# Source0-md5: e6e721a38650c4c453c686c5d871862d
 Source1:       http://home.freeuk.com/cpdrummond/%{name}-Gtk2-%{gtk2_ver}.tar.bz2
-# Source1-md5: 0d5eeb45990c3ecf060daa68a2ed2e6f
+# Source1-md5: afa418c3d22091fb4ef9397de0195a23
 Source2:       http://home.freeuk.com/cpdrummond/%{name}-Gtk1-%{gtk1_ver}.tar.gz
 # Source2-md5: 8219f58493ca4e65a8fe61ee76eca522
 Patch0:                %{name}-Gtk2-userjs.patch
 Patch1:                %{name}-Gtk2-mailto.patch
+Patch2:                %{name}-Gtk1-lib64.patch
 URL:           http://www.kde-look.org/content/show.php?content=40492
 BuildRequires: autoconf
 BuildRequires: automake
@@ -48,6 +49,7 @@ Darmowa i poprawiona wersja motywu GTK+/Qt zrobionego przez Red Hata.
 %package -n kde-style-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:       %{kde_ver}
 Group:         Themes
 Requires:      kdelibs >= 3.1
 
@@ -89,7 +91,7 @@ Wersja pod GTK+2.
 %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}
+Version:       %{ver}
 Group:         Themes
 Obsoletes:     gtk-theme-bluecurve
 Obsoletes:     gtk2-theme-bluecurve
@@ -114,12 +116,21 @@ cd %{name}-Gtk2-%{gtk2_ver}
 cd -
 %endif
 
+%if %{with gtk}
+%if "%{_lib}" == "lib64"
+cd %{name}-Gtk1-%{gtk1_ver}
+%patch2 -p1
+cd -
+%endif
+%endif
+
+
 %build
 %if %{with kde}
 cd %{name}-KDE3-%{kde_ver}
 %cmake \
        -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-       .
+
 %{__make}
 cd -
 %endif
@@ -143,7 +154,7 @@ cd %{name}-Gtk2-%{gtk2_ver}
        -DQTC_MODIFY_MOZILLA=true \
        -DQTC_MODIFY_MOZILLA_USER_JS=true \
        -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-       .
+
 %{__make}
 cd -
 %endif
@@ -210,5 +221,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n theme-QtCurve-common
 %defattr(644,root,root,755)
-%doc %{name}-KDE3-%{kde_ver}/{ChangeLog,README,TODO}
+%doc %{name}-KDE3-%{kde_ver}/ChangeLog
+%doc %{name}-KDE3-%{kde_ver}/README
+%doc %{name}-KDE3-%{kde_ver}/TODO
 %dir %{_datadir}/themes/QtCurve