- updated to 0.6.2

- separated QtDesigner plugin

diff --git a/libqxt.spec b/libqxt.spec
index e6ef00f66a457c55271a2efea05883230a7e4f4d..9f242431540d1e69e17f71ffb190cf0fd769eae7 100644 (file)
--- a/libqxt.spec
+++ b/libqxt.spec
@@ -1,54 +1,86 @@
 # NOTE
 # - no longer maintained
 Summary:       Qt extension library
+Summary(pl.UTF-8):     Biblioteka rozszerzeń Qt
 Name:          libqxt
-Version:       0.6.0
-Release:       2
-License:       CPL or LGPL v2
+Version:       0.6.2
+Release:       1
+License:       CPL v1.0 or LGPL v2.1
 Group:         Libraries
-Source0:       http://bitbucket.org/libqxt/libqxt/get/v%{version}.tar.bz2
-# Source0-md5: 129527c1b18676720f59d22bb4d5ef18
+Source0:       https://bitbucket.org/libqxt/libqxt/get/v%{version}.tar.bz2?/%{name}-%{version}.tar.bz2
+# Source0-md5: a859a1757dc0aaf010df1a0783e3e001
 Patch0:                %{name}-linking.patch
 Patch1:                %{name}-db.patch
 URL:           https://bitbucket.org/libqxt/libqxt/wiki/Home
-BuildRequires: QtDesigner-devel
-BuildRequires: QtNetwork-devel
-BuildRequires: QtSql-devel
+BuildRequires: QtCore-devel >= 4.3
+BuildRequires: QtDesigner-devel >= 4.3
+BuildRequires: QtGui-devel >= 4.3
+BuildRequires: QtNetwork-devel >= 4.3
+BuildRequires: QtScript-devel >= 4.3
+BuildRequires: QtSql-devel >= 4.3
 BuildRequires: avahi-compat-libdns_sd-devel
 BuildRequires: avahi-devel
 BuildRequires: db-devel
+BuildRequires: libstdc++-devel
 BuildRequires: openssl-devel
-BuildRequires: qt4-build
-BuildRequires: qt4-qmake
+BuildRequires: qt4-build >= 4.3
+BuildRequires: qt4-qmake >= 4.3
 BuildRequires: sed >= 4.0
 BuildRequires: which
 BuildRequires: xorg-lib-libXrandr-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _qt4_datadir    %{_datadir}/qt4
-%define                _qt4_plugindir  %{_libdir}/qt4/plugins
+%define                qt4_datadir     %{_datadir}/qt4
+%define                qt4_plugindir   %{_libdir}/qt4/plugins
 
 %description
 LibQxt, an extension library for Qt, provides a suite of
 cross-platform utility classes to add functionality not readily
 available in the Qt toolkit.
 
-%package       devel
-Summary:       Development files for %{name}
+%description
+LibQxt to biblioteka rozszeszeń Qt, udostępniająca zbiór
+wieloplatformowych klas narzędziowych dodających funkcje nie
+dostępne w łatwy sposób w bibliotekach Qt.
+
+%package devel
+Summary:       Development files for Qxt libraries
+Summary(pl.UTF-8):     Pliki programistyczne bibliotek Qxt
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
+Requires:      QtCore-devel >= 4.3
+Requires:      QtGui-devel >= 4.3
+Requires:      QtNetwork-devel >= 4.3
+Requires:      QtSql-devel >= 4.3
 Requires:      avahi-compat-libdns_sd-devel
 Requires:      avahi-devel
 Requires:      db-devel
-Requires:      qt4-build
-Requires:      qt4-qmake
+Requires:      libstdc++-devel
+Requires:      qt4-qmake >= 4.3
+
+%description devel
+This package contains the header files for developing applications
+that use LibQxt.
 
-%description   devel
-This package contains libraries and header files for developing
-applications that use LibQxt.
+%description devel -l pl.UTF-8
+Ten pakiet  zawiera pliki nagłówkowe do tworzenia aplikacji
+wykorzystujących libQxt.
+
+%package -n QtDesigner-plugin-qxt
+Summary:       QtDesigner plugin to support Qxt libraries
+Summary(pl.UTF-8):     Wtyczka QtDesignera wspomagająca korzystanie z bibliotek Qxt
+Group:         Development/Tools
+Requires:      %{name} = %{version}-%{release}
+Requires:      QtDesigner >= 4.3
+
+%description -n QtDesigner-plugin-qxt
+QtDesigner plugin to support Qxt libraries.
+
+%description -n QtDesigner-plugin-qxt -l pl.UTF-8
+Wtyczka QtDesignera wspomagająca korzystanie z bibliotek Qxt.
 
 %prep
-%setup -q -n %{name}
+%setup -q -n libqxt-libqxt-dadc327c2a6a
 %patch0 -p1
 %patch1 -p1
 
@@ -70,10 +102,10 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        INSTALL_ROOT=$RPM_BUILD_ROOT
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.so.0.6
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/lib*.so.0.6
 
 # We are installing these to the proper location
-rm -rf $RPM_BUILD_ROOT%{_prefix}/doc
+%{__rm} -r $RPM_BUILD_ROOT%{_prefix}/doc
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -83,7 +115,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS CHANGES *.txt README
+%doc AUTHORS CHANGES *.txt LICENSE README
 %attr(755,root,root) %{_libdir}/libQxtBerkeley.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libQxtBerkeley.so.0
 %attr(755,root,root) %{_libdir}/libQxtCore.so.*.*.*
@@ -103,6 +135,13 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc examples
 #%doc doc/html
+%attr(755,root,root) %{_libdir}/libQxtBerkeley.so
+%attr(755,root,root) %{_libdir}/libQxtCore.so
+%attr(755,root,root) %{_libdir}/libQxtGui.so
+%attr(755,root,root) %{_libdir}/libQxtNetwork.so
+%attr(755,root,root) %{_libdir}/libQxtSql.so
+%attr(755,root,root) %{_libdir}/libQxtWeb.so
+%attr(755,root,root) %{_libdir}/libQxtZeroconf.so
 %{_includedir}/QxtBerkeley
 %{_includedir}/QxtCore
 %{_includedir}/QxtGui
@@ -110,12 +149,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/QxtSql
 %{_includedir}/QxtWeb
 %{_includedir}/QxtZeroconf
-%{_libdir}/libQxtBerkeley.so
-%{_libdir}/libQxtCore.so
-%{_libdir}/libQxtGui.so
-%{_libdir}/libQxtNetwork.so
-%{_libdir}/libQxtSql.so
-%{_libdir}/libQxtWeb.so
-%{_libdir}/libQxtZeroconf.so
-%{_qt4_plugindir}/designer/*.so
-%{_qt4_datadir}/mkspecs/features/qxt*.prf
+%{qt4_datadir}/mkspecs/features/qxt*.prf
+
+%files -n QtDesigner-plugin-qxt
+%defattr(644,root,root,755)
+%attr(755,root,root) %{qt4_plugindir}/designer/libQxtDesignerPlugins.so