rpms/boinc-client/devel .cvsignore, 1.3, 1.4 boinc-client.spec, 1.19, 1.20 sources, 1.3, 1.4 trim, 1.1, 1.2 boinc-client, 1.1, NONE boinc.1, 1.1, NONE boinc_client.1, 1.1, NONE boinc_cmd.1, 1.1, NONE boincmgr.1, 1.1, NONE

Thu Jan 1 22:36:10 UTC 2009

Author: mjakubicek

Update of /cvs/pkgs/rpms/boinc-client/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14270

Modified Files:
	.cvsignore boinc-client.spec sources trim 
Removed Files:
	boinc-client boinc.1 boinc_client.1 boinc_cmd.1 boincmgr.1 
Log Message:
- Update to 6.4.5
- Updated boinc-gccflags.patch and boinc-locales.patch
- Not trimming doc/ subdirectory
- Bash completion now provided by the source tarball,
  not packaged as separate sources anymore.
- Supplied example /etc/sysconfig configuration file
- Added BR: docbook2X for autogenerating manpages, not packaged as separate
  sources anymore.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/boinc-client/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4

--- .cvsignore	26 Aug 2008 20:27:10 -0000	1.3
+++ .cvsignore	1 Jan 2009 22:35:38 -0000	1.4
@@ -1 +1 @@
-boinc-6.2.15.tar.bz2
+boinc-6.4.5.tar.bz2


Index: boinc-client.spec
===================================================================
RCS file: /cvs/pkgs/rpms/boinc-client/devel/boinc-client.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- boinc-client.spec	13 Dec 2008 14:02:56 -0000	1.19
+++ boinc-client.spec	1 Jan 2009 22:35:38 -0000	1.20
@@ -1,10 +1,10 @@
-%define snap 20080818
-%define version_ 6_2_15
+%define snap 20081217
+%define version_ 6_4_5
 
 Summary:	The BOINC client core
 Name:		boinc-client
-Version:	6.2.15
-Release:	2.%{snap}svn%{?dist}
+Version:	6.4.5
+Release:	1.%{snap}svn%{?dist}
 License:	LGPLv2+
 Group:		Applications/Engineering
 URL:		http://boinc.berkeley.edu/
@@ -21,13 +21,8 @@
 Source1:	boinc-client-init-d
 Source2:	boinc-client-logrotate-d
 Source3:	boinc-manager.desktop
-Source4:	boinc.1
-Source5:	boinc_client.1
-Source6:	boinc_cmd.1
-Source7:	boincmgr.1
 Source8:	trim
 Source9:	unicode
-Source10:	boinc-client
 #Remove -fomit-frame-pointer and -ffast-math gcc flags:
 #Reported in upstream bugtracker: http://boinc.berkeley.edu/trac/ticket/647
 Patch1:		boinc-gccflags.patch
@@ -53,6 +48,7 @@
 BuildRequires:  mysql-devel
 BuildRequires:  libXmu-devel
 BuildRequires:  libjpeg-devel
+BuildRequires:	docbook2X
 
 %description
 The Berkeley Open Infrastructure for Network Computing (BOINC) is an open-
@@ -111,10 +107,17 @@
 %define boinc_platform ppc64-linux-gnu
 %endif
 
+#quick fix to make build & install to work, filed in upstream's bugtracker under
+#http://boinc.berkeley.edu/trac/ticket/811
+sed -i "s/boincmgr.16x16.png boincmgr.32x32.png boincmgr.48x48.png//" clientgui/res/Makefile.in
+echo "install:" >> samples/example_app/Makefile
+
+%define confflags --disable-static --enable-unicode STRIP=: DOCBOOK2X_MAN=/usr/bin/db2x_docbook2man
+
 %if %{defined boinc_platform}
-%configure --disable-static --enable-unicode --with-boinc-platform=%{boinc_platform} STRIP=:
+%configure %{confflags} --with-boinc-platform=%{boinc_platform}
 %else
-%configure --disable-static --enable-unicode STRIP=:
+%configure %{confflags}
 %endif
 
 
@@ -148,11 +151,14 @@
 pushd $RPM_BUILD_ROOT%{_bindir}
   ln -s boinc_client boinc
   mv boinc_gui boincmgr
+  mv boinc_cmd boinccmd
 popd
 
 rm $RPM_BUILD_ROOT%{_bindir}/ca-bundle.crt
 #because it's already included in curl
 
+# own init script and logrotate configuration file
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/init.d/%{name}
 install -p -m755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/%{name}
 install -p -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name}
 
@@ -164,12 +170,6 @@
 install -p -m644 sea/boincmgr.48x48.png \
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/boincmgr.png
 
-# man page
-install -p -m644 %{SOURCE4} $RPM_BUILD_ROOT%{_mandir}/man1
-install -p -m644 %{SOURCE5} $RPM_BUILD_ROOT%{_mandir}/man1
-install -p -m644 %{SOURCE6} $RPM_BUILD_ROOT%{_mandir}/man1
-install -p -m644 %{SOURCE7} $RPM_BUILD_ROOT%{_mandir}/man1
-
 desktop-file-install %{?_remove_encoding} --vendor fedora \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   %{SOURCE3}
@@ -183,8 +183,7 @@
 %find_lang BOINC-Manager
 
 # bash-completion
-
-install -Dp -m644 %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/boinc-client
+install -Dp -m644 client/scripts/boinc.bash $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/boinc-client
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -239,14 +238,13 @@
 %doc checkin_notes_2002
 %{_bindir}/boinc
 %{_bindir}/boinc_client
-%{_bindir}/boinc_cmd
+%{_bindir}/boinccmd
 %{_bindir}/crypt_prog
 %{_bindir}/switcher
 %{_initrddir}/%{name}
+%{_sysconfdir}/sysconfig/%{name}
+%{_mandir}/man1/boinccmd.1.gz
 %{_mandir}/man1/boinc.1.gz
-%{_mandir}/man1/boinc_client.1.gz
-%{_mandir}/man1/boinc_cmd.1.gz
-%{_mandir}/man1/boincmgr.1.gz
 %defattr(-,boinc,boinc,-)
 %{_localstatedir}/lib/boinc/
 
@@ -257,6 +255,7 @@
 %{_datadir}/icons/hicolor/16x16/apps/boincmgr.png
 %{_datadir}/icons/hicolor/32x32/apps/boincmgr.png
 %{_datadir}/icons/hicolor/48x48/apps/boincmgr.png
+%{_mandir}/man1/boincmgr.1.gz
 
 %files devel
 %defattr(-,root,root,-)
@@ -266,10 +265,20 @@
 %{_libdir}/libsched.a
 %{_libdir}/libboinc_graphics2.a
 
-%dir %{_includedir}/BOINC
-%{_includedir}/BOINC/*
+%dir %{_includedir}/boinc
+%{_includedir}/boinc/*
 
 %changelog
+* Wed Dec 17 2008 Milos Jakubicek <xjakub at fi.muni.cz> - 6.4.5-1.20081217svn
+- Update to 6.4.5
+- Updated boinc-gccflags.patch and boinc-locales.patch
+- Not trimming doc/ subdirectory
+- Bash completion now provided by the source tarball,
+  not packaged as separate sources anymore.
+- Supplied example /etc/sysconfig configuration file
+- Added BR: docbook2X for autogenerating manpages, not packaged as separate
+  sources anymore.
+
 * Sat Dec 13 2008 Milos Jakubicek <xjakub at fi.muni.cz> - 6.2.15-2.20080818svn
 - Fix usage of $BOINCDIR in the init script
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/boinc-client/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	26 Aug 2008 20:27:10 -0000	1.3
+++ sources	1 Jan 2009 22:35:38 -0000	1.4
@@ -1 +1 @@
-5da6b42595a0c9155c71dce49fec2dbe  boinc-6.2.15.tar.bz2
+98433ea90755d0579dcc778da99b9fa0  boinc-6.4.5.tar.bz2


Index: trim
===================================================================
RCS file: /cvs/pkgs/rpms/boinc-client/devel/trim,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- trim	25 Mar 2008 20:13:30 -0000	1.1
+++ trim	1 Jan 2009 22:35:38 -0000	1.2
@@ -9,7 +9,7 @@
 
 echo "Trimming directories..."
 
-DIRS="win_build doc html openssl client/os2 client/win clientgui/mac clientlib clienttray curl/include curl/mswin curl/patches lib/mac mac_build mac_installer zip/zip/macos zip/zip/win32 zip/unzip/macos zip/unzip/win32 zlib RSAEuro stripchart"
+DIRS="win_build html openssl client/os2 client/win clientgui/mac clientlib clienttray curl/include curl/mswin curl/patches lib/mac mac_build mac_installer zip/zip/macos zip/zip/win32 zip/unzip/macos zip/unzip/win32 zlib RSAEuro stripchart coprocs/CUDA/mswin"
 
 for DIR in $DIRS; do
 	/bin/rm -rf $1/$DIR;


--- boinc-client DELETED ---


--- boinc.1 DELETED ---


--- boinc_client.1 DELETED ---


--- boinc_cmd.1 DELETED ---


--- boincmgr.1 DELETED ---


