Author: glen Date: Sat Apr 2 13:39:45 2011 GMT Module: packages Tag: HEAD ---- Log message: - system QtSingleApplication build possible - use configure & make install - more and verbose files
---- Files affected: packages/qbittorrent: qbittorrent.spec (1.95 -> 1.96) ---- Diffs: ================================================================ Index: packages/qbittorrent/qbittorrent.spec diff -u packages/qbittorrent/qbittorrent.spec:1.95 packages/qbittorrent/qbittorrent.spec:1.96 --- packages/qbittorrent/qbittorrent.spec:1.95 Tue Mar 29 13:44:54 2011 +++ packages/qbittorrent/qbittorrent.spec Sat Apr 2 15:39:40 2011 @@ -1,4 +1,9 @@ # $Revision$, $Date$ +# +# Conditional build: +%bcond_with qsa # build with system QtSingleApplication (unfinished) + +%define qtver 4.5 Summary: qbittorrent - Qt4-based torrent client Summary(hu.UTF-8): qbittorrent - Qt4-alapĂș torrent kliens Summary(pl.UTF-8): qbittorrent - graficzny klient torrenta oparty na Qt4 @@ -12,16 +17,19 @@ Patch0: lang-hu-2.3.0.patch URL: http://qbittorrent.sourceforge.net/ BuildRequires: GeoIP-devel -BuildRequires: QtCore-devel >= 4.4.0 -BuildRequires: QtDBus-devel >= 4.4.0 -BuildRequires: QtGui-devel >= 4.4.0 -BuildRequires: QtNetwork-devel >= 4.4.0 -BuildRequires: QtXml-devel >= 4.4.0 +BuildRequires: QtCore-devel >= %{qtver} +BuildRequires: QtDBus-devel >= %{qtver} +BuildRequires: QtGui-devel >= %{qtver} +BuildRequires: QtNetwork-devel >= %{qtver} +%{?with_qsa:BuildRequires: QtSingleApplication-devel} +BuildRequires: QtSvg-devel >= %{qtver} +BuildRequires: QtXml-devel >= %{qtver} BuildRequires: boost-devel >= 1.36.0 +BuildRequires: libnotify-devel >= 0.4.2 BuildRequires: libtorrent-rasterbar-devel >= 1:0.15.5 BuildRequires: pkgconfig -BuildRequires: qt4-build >= 4.4.0 -BuildRequires: qt4-qmake >= 4.4.0 +BuildRequires: qt4-build >= %{qtver} +BuildRequires: qt4-qmake >= %{qtver} BuildRequires: rpmbuild(macros) >= 1.129 BuildRequires: which Requires: libtorrent-rasterbar >= 1:0.15.5 @@ -41,44 +49,34 @@ %setup -q %patch0 -p1 +%if %{with qsa} +%{__rm} -r src/qtsingleapp +%endif + %build -qmake-qt4 \ - QMAKE_CXX="%{__cxx}" \ - QMAKE_CXXFLAGS_RELEASE="%{rpmcxxflags}" +# NOTE: not autoconf based configure +./configure \ + --prefix=%{_prefix} \ + %{?with_qsa:--with-qtsingleapplication=system} %{__make} %install rm -rf $RPM_BUILD_ROOT - -install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1,%{_desktopdir}} -install -d $RPM_BUILD_ROOT%{_iconsdir}/hicolor/{128x128/apps,16x16/apps,192x192/apps,22x22/apps,24x24/apps,32x32/apps,36x36/apps,48x48/apps,64x64/apps,72x72/apps,96x96/apps} - -install src/qbittorrent $RPM_BUILD_ROOT%{_bindir} -install doc/* $RPM_BUILD_ROOT%{_mandir}/man1 -install src/Icons/qBittorrent.desktop $RPM_BUILD_ROOT%{_desktopdir} -install src/menuicons/16x16/apps/* $RPM_BUILD_ROOT%{_iconsdir}/hicolor/16x16/apps -install src/menuicons/22x22/apps/* $RPM_BUILD_ROOT%{_iconsdir}/hicolor/22x22/apps -install src/menuicons/24x24/apps/* $RPM_BUILD_ROOT%{_iconsdir}/hicolor/24x24/apps -install src/menuicons/32x32/apps/* $RPM_BUILD_ROOT%{_iconsdir}/hicolor/32x32/apps -install src/menuicons/36x36/apps/* $RPM_BUILD_ROOT%{_iconsdir}/hicolor/36x36/apps -install src/menuicons/48x48/apps/* $RPM_BUILD_ROOT%{_iconsdir}/hicolor/48x48/apps -install src/menuicons/64x64/apps/* $RPM_BUILD_ROOT%{_iconsdir}/hicolor/64x64/apps -install src/menuicons/72x72/apps/* $RPM_BUILD_ROOT%{_iconsdir}/hicolor/72x72/apps -install src/menuicons/96x96/apps/* $RPM_BUILD_ROOT%{_iconsdir}/hicolor/96x96/apps -install src/menuicons/128x128/apps/* $RPM_BUILD_ROOT%{_iconsdir}/hicolor/128x128/apps -install src/menuicons/192x192/apps/* $RPM_BUILD_ROOT%{_iconsdir}/hicolor/192x192/apps +%{__make} install \ + INSTALL_ROOT=$RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) -%doc AUTHORS Changelog README -%attr(755,root,root) %{_bindir}/%{name} -%{_mandir}/man1/*.1* -%{_iconsdir}/hicolor/*/apps/* +%doc README NEWS AUTHORS TODO Changelog +%attr(755,root,root) %{_bindir}/qbittorrent +%{_mandir}/man1/qbittorrent.1* +%{_iconsdir}/hicolor/*/apps/qbittorrent.png %{_desktopdir}/qBittorrent.desktop +%{_pixmapsdir}/qbittorrent.png %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -86,6 +84,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.96 2011/04/02 13:39:40 glen +- system QtSingleApplication build possible +- use configure & make install +- more and verbose files + Revision 1.95 2011/03/29 11:44:54 lisu - up to 2.7.1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/qbittorrent/qbittorrent.spec?r1=1.95&r2=1.96&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
