rpms/qbittorrent/F-12 qbittorrent.spec,1.52,1.53
Leigh Scott
leigh123linux at fedoraproject.org
Wed Jan 20 23:30:05 UTC 2010
Author: leigh123linux
Update of /cvs/pkgs/rpms/qbittorrent/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9420
Modified Files:
qbittorrent.spec
Log Message:
* Wed Jan 20 2010 leigh scott <leigh123linux at googlemail.com> - 2.1.1-2
- seperate the gui and nox build processes so debuginfo is built properly
Index: qbittorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/F-12/qbittorrent.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- qbittorrent.spec 20 Jan 2010 19:52:27 -0000 1.52
+++ qbittorrent.spec 20 Jan 2010 23:30:04 -0000 1.53
@@ -3,7 +3,7 @@
Name: qbittorrent
Summary: A Bittorrent Client
Version: 2.1.1
-Release: 1%{?dist}
+Release: 2%{?dist}
# The source for this package was pulled from upstream's vcs. Use the
# following commands to generate the tarball:
# svn checkout -r %{svn_rev} https://qbittorrent.svn.sourceforge.net/svnroot/qbittorrent/trunk qbittorrent
@@ -45,22 +45,32 @@ It aims to be as fast as possible and to
%build
# use ./configure instead of %%configure as it doesn't work
# configure and make headless first
-./configure --prefix=%{_prefix} \
- --disable-gui
+mkdir -p build-nox
+cd build-nox
+../configure --prefix=%{_prefix} --disable-gui
+cp conf.pri ..
make %{?_smp_mflags}
-make clean
+mv -f ../conf.pri ../conf.pri.nox
# configure and make gui version
-./configure --prefix=%{_prefix}
+cd ..
+mkdir -p build-gui
+cd build-gui
+../configure --prefix=%{_prefix}
+cp conf.pri ..
make %{?_smp_mflags}
+mv -f ../conf.pri ../conf.pri.gui
+
%install
rm -rf $RPM_BUILD_ROOT
# install headless version
-mkdir -p $RPM_BUILD_ROOT%{_bindir}
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-install -m 755 -p src/qbittorrent-nox $RPM_BUILD_ROOT%{_bindir}
-install -m 644 -p doc/qbittorrent-nox.1 $RPM_BUILD_ROOT%{_mandir}/man1
+mv -f conf.pri.nox conf.pri
+cd build-nox
+make INSTALL_ROOT=$RPM_BUILD_ROOT install
# install gui version
+cd ..
+mv -f conf.pri.gui conf.pri
+cd build-gui
make INSTALL_ROOT=$RPM_BUILD_ROOT install
desktop-file-install \
@@ -100,6 +110,9 @@ gtk-update-icon-cache %{_datadir}/icons/
%changelog
+* Wed Jan 20 2010 leigh scott <leigh123linux at googlemail.com> - 2.1.1-2
+- seperate the gui and nox build processes so debuginfo is built properly
+
* Wed Jan 20 2010 leigh scott <leigh123linux at googlemail.com> - 2.1.1-1
- update to 2.1.1
More information about the scm-commits
mailing list