- rel 2; install bitcoind, too; put qt wallet into separate subpackage

diff --git a/bitcoin.spec b/bitcoin.spec
index 36b24404580f7c41d57dc927c14d78936941b8ed..9a24dacef56adfdb18ea889e8707fb967bfa65c0 100644 (file)
--- a/bitcoin.spec
+++ b/bitcoin.spec
@@ -1,7 +1,7 @@
 Summary:       Bitcoin is a peer-to-peer currency
 Name:          bitcoin
 Version:       0.8.1
-Release:       1
+Release:       2
 License:       MIT/X11
 Group:         X11/Applications
 Source0:       https://github.com/bitcoin/bitcoin/archive/v%{version}.tar.gz
@@ -16,6 +16,7 @@ BuildRequires:        miniupnpc-devel >= 1.5
 BuildRequires: openssl-devel
 BuildRequires: qrencode-devel
 BuildRequires: qt4-qmake
+Requires:      perl-base
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -23,6 +24,13 @@ Bitcoin is a peer-to-peer currency. Peer-to-peer means that no central
 authority issues new money or tracks transactions. These tasks are
 managed collectively by the network.
 
+%package qt
+Summary:       Qt-based Bitcoin Wallet
+Group:         X11/Applications
+
+%description qt
+Qt-based Bitcoin Wallet.
+
 %prep
 %setup -q
 
@@ -34,22 +42,41 @@ qmake-qt4 \
 
 %{__make}
 
+%{__make} -C src -f makefile.unix \
+       CXX="%{__cxx}" \
+       CXXFLAGS="%{rpmcflags} %{rpmcxxflags} %{rpmcppflags}"
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_localedir},%{_desktopdir},%{_pixmapsdir},%{_datadir}/kde4/services}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir}/%{name},%{_mandir}/man{1,5},%{_localedir},%{_desktopdir},%{_pixmapsdir},%{_datadir}/kde4/services}
+
+install src/bitcoind $RPM_BUILD_ROOT%{_libdir}/%{name}/bitcoind
+sed -e 's#/usr/lib/bitcoin/#%{_libdir}/%{name}/#g' contrib/debian/bin/bitcoind > $RPM_BUILD_ROOT%{_bindir}/bitcoind
+chmod 755 $RPM_BUILD_ROOT%{_bindir}/bitcoind
 
 install bitcoin-qt $RPM_BUILD_ROOT%{_bindir}
 install contrib/debian/bitcoin-qt.desktop $RPM_BUILD_ROOT%{_desktopdir}
 install contrib/debian/bitcoin-qt.protocol $RPM_BUILD_ROOT%{_datadir}/kde4/services
 install share/pixmaps/bitcoin{32,80}.xpm $RPM_BUILD_ROOT%{_pixmapsdir}
 
+install contrib/debian/manpages/bitcoind.1 $RPM_BUILD_ROOT%{_mandir}/man1
+install contrib/debian/manpages/bitcoin.conf.5 $RPM_BUILD_ROOT%{_mandir}/man5
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc doc/*.txt
+%doc doc/*.txt contrib/debian/examples/bitcoin.conf
+%attr(755,root,root) %{_bindir}/bitcoind
+%dir %{_libdir}/%{name}
+%attr(755,root,root) %{_libdir}/%{name}/bitcoind
+%{_mandir}/man1/bitcoind.1*
+%{_mandir}/man5/bitcoin.conf.5*
+
+%files qt
+%defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/bitcoin-qt
 %{_datadir}/kde4/services/bitcoin-qt.protocol
 %{_desktopdir}/bitcoin-qt.desktop