rpms/qbittorrent/devel .cvsignore, 1.38, 1.39 gcc.patch, 1.6, 1.7 qbittorrent.spec, 1.64, 1.65 sources, 1.39, 1.40

[Leigh Scott]

Author: leigh123linux

Update of /cvs/pkgs/rpms/qbittorrent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6146

Modified Files:
	.cvsignore gcc.patch qbittorrent.spec sources 
Log Message:
* Tue Jan 05 2010 Leigh Scott <leigh123linux at googlemail.com> - 2.1.0-0.6.rc4
- update to 2.1.0rc4
- build headless version as well



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- .cvsignore	5 Jan 2010 22:38:13 -0000	1.38
+++ .cvsignore	9 Jan 2010 12:52:07 -0000	1.39
@@ -1 +1 @@
-qbittorrent-2.1.0rc3.tar.gz
+qbittorrent-2.1.0rc4.tar.gz

gcc.patch:
 src.pro |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Index: gcc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/gcc.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- gcc.patch	5 Jan 2010 22:38:13 -0000	1.6
+++ gcc.patch	9 Jan 2010 12:52:07 -0000	1.7
@@ -16,6 +16,6 @@ diff -up qbittorrent-2.0.2/src/src.pro.n
  
 +QMAKE_CXXFLAGS_RELEASE += -fno-var-tracking-assignments
  # Update this VERSION for each release
- DEFINES += VERSION=\\\"v2.1.0rc3\\\"
+ DEFINES += VERSION=\\\"v2.1.0rc4\\\"
  DEFINES += VERSION_MAJOR=2
 


Index: qbittorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/qbittorrent.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- qbittorrent.spec	5 Jan 2010 22:38:13 -0000	1.64
+++ qbittorrent.spec	9 Jan 2010 12:52:07 -0000	1.65
@@ -3,7 +3,7 @@
 Name:    qbittorrent
 Summary: A Bittorrent Client 
 Version: 2.1.0
-Release: 0.5.rc3%{?dist}
+Release: 0.6.rc4%{?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
@@ -11,7 +11,7 @@ Release: 0.5.rc3%{?dist}
 # tar -czvf qbittorrent-%{svn_rev}svn.tar.gz qbittorrent
 #Source0:  %{name}-%{svn_rev}svn.tar.gz
 #Source0: http://downloads.sf.net/qbittorrent/%{name}-%{version}.tar.gz
-Source0: http://downloads.sf.net/qbittorrent/files/qbittorrent-unstable/%{name}-%{version}rc3.tar.gz
+Source0: http://downloads.sf.net/qbittorrent/files/qbittorrent-unstable/%{name}-%{version}rc4.tar.gz
 # https://bugzilla.redhat.com/show_bug.cgi?id=548491
 Patch1:  gcc.patch
 
@@ -33,19 +33,40 @@ BuildRequires: libnotify-devel
 A Bittorrent client using rb_libtorrent and a Qt4 Graphical User Interface.
 It aims to be as fast as possible and to provide multi-OS, unicode support.
 
+%package nox
+Summary: A Headless Bittorrent Client
+Group: Applications/Internet
+
+%description nox
+A Headless Bittorrent client using rb_libtorrent.
+It aims to be as fast as possible and to provide multi-OS, unicode support.
+
 %prep
-%setup -q -n %{name}-%{version}rc3
+%setup -q -n %{name}-%{version}rc4
 %patch1 -p1 -b .gcc
 
 %build
 # use ./configure instead of %%configure as it doesn't work
+# configure and make headless first
+./configure --prefix=%{_prefix} --disable-gui
+make %{?_smp_mflags}
+make clean
+# configure and make gui version
 ./configure --prefix=%{_prefix}
 make %{?_smp_mflags}
 
+
 %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
+# install gui version
 make INSTALL_ROOT=$RPM_BUILD_ROOT install
 
+
 desktop-file-install \
   --dir=$RPM_BUILD_ROOT%{_datadir}/applications/ \
   --delete-original \
@@ -76,7 +97,17 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/applications/qBittorrent.desktop
 %{_datadir}/icons/hicolor/*/apps/qbittorrent.png
 
+%files nox
+%defattr(-,root,root,-)
+%{_bindir}/qbittorrent-nox
+%{_mandir}/man1/qbittorrent-nox.1*
+
+
 %changelog
+* Tue Jan 05 2010 Leigh Scott <leigh123linux at googlemail.com> - 2.1.0-0.6.rc4
+- update to 2.1.0rc4
+- build headless version as well
+
 * Tue Jan 05 2010 Leigh Scott <leigh123linux at googlemail.com> - 2.1.0-0.5.rc3
 - update to 2.1.0rc3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- sources	5 Jan 2010 22:38:13 -0000	1.39
+++ sources	9 Jan 2010 12:52:07 -0000	1.40
@@ -1 +1 @@
-ef606abda0b9dc7fc091668cbeb20ac8  qbittorrent-2.1.0rc3.tar.gz
+5f6413e4a18032ea3113278a76c78509  qbittorrent-2.1.0rc4.tar.gz