Hello community, here is the log from the commit of package boinc-client for openSUSE:Factory checked in at 2014-06-26 15:07:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/boinc-client (Old) and /work/SRC/openSUSE:Factory/.boinc-client.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "boinc-client" Changes: -------- --- /work/SRC/openSUSE:Factory/boinc-client/boinc-client.changes 2013-10-29 09:13:47.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.boinc-client.new/boinc-client.changes 2014-06-26 15:07:17.000000000 +0200 @@ -1,0 +2,58 @@ +Tue Jun 17 13:39:32 UTC 2014 - [email protected] + +- Remove needless rpmlintrc lines to ease error spotting when there + really are some. + +------------------------------------------------------------------- +Tue Jun 17 13:30:10 UTC 2014 - [email protected] + +- Cleanup with spec-cleaner for better readability +- Move lang packages from Requires to Recommends + +------------------------------------------------------------------- +Tue Jun 17 13:13:14 UTC 2014 - [email protected] + +- Remove unused patch: + * boinc-completion.patch +- Remove comments with unused patches +- Remove conditionals with inits as we don't build for such release + anyway +- Provide rcboinc symlink for easier usage. + +------------------------------------------------------------------- +Wed Mar 26 22:34:18 UTC 2014 - [email protected] + +- some RPMLINT fixes + * fix License: remove ',' + * non-standard-gid /var/lib/boinc boinc + * SR #227671 to rpmlint +- fix deps for libxcb + +------------------------------------------------------------------- +Tue Mar 18 15:21:19 UTC 2014 - [email protected] + +- fix README.SUSE + +------------------------------------------------------------------- +Sun Mar 16 22:23:48 UTC 2014 - [email protected] + +# fix for bnc#779335 + * disabled boinc-completion.patch +- update to 7.2.42 + * Fix problem that was causing scheduler RPCs to fail on Yoyo@home + (HTTP status code 400) + * for mor info have a look at + http://boinc.berkeley.edu/wiki/Release_Notes +- removed obsolete patches: + * boinc-client-dynamic_buffers.patch + * boinc-init.patch + * boinc-client-7.0.36-AM_CONDITIONAL.patch + * boinc-client-7.0.36-dynamic_buffers.patch +- rebased patches: + * boinc-LC_MESSAGES.patch + * boinc-client-AM_CONDITIONAL.patch + * boinc-configure.patch + * boinc-docbook2x.patch + * boinc-guirpcauth.patch + +------------------------------------------------------------------- @@ -11,0 +70,10 @@ + +------------------------------------------------------------------- +Wed May 1 20:53:41 UTC 2013 - [email protected] + +- update to 7.0.28 + * sorry but there is no ChangeLog :( +- rebase patches + * dynamic_buffers, guirpcauth, AM_CONDITIONAL +- add configure patch +- remove obsolete glib_h patch Old: ---- boinc-client-7.0.36-AM_CONDITIONAL.patch boinc-client-7.0.36-dynamic_buffers.patch boinc-client-systemd boinc-client.init boinc-completion.patch boinc-init.patch boinc_core_release-7_0_36.tar.bz2 New: ---- boinc-7.2.42.tar.bz2 boinc-client-AM_CONDITIONAL.patch boinc-client.service boinc-configure.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ boinc-client.spec ++++++ --- /var/tmp/diff_new_pack.8wZWGn/_old 2014-06-26 15:07:20.000000000 +0200 +++ /var/tmp/diff_new_pack.8wZWGn/_new 2014-06-26 15:07:20.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package boinc-client # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2011 by Sascha Manns <[email protected]> # # All modifications and additions to the file contributed by third parties @@ -19,21 +19,27 @@ # Global definitions %define _use_internal_dependency_generator 0 -%if 0%{?suse_version} >= 1140 -%define __find_requires %wx_requires -%endif -%define version_ 7_0_36 +%define __find_requires %{wx_requires} %define soname 7 %define boinc_dir %{_localstatedir}/lib/boinc - Name: boinc-client -Version: 7.0.36 +Version: 7.2.42 Release: 0 -Summary: The BOINC client core -License: LGPL-3.0 +Summary: The BOINC client +License: GPL-3.0+ or LGPL-3.0+ Group: Productivity/Clustering/Computing Url: http://boinc.berkeley.edu/ -Source0: boinc_core_release-%{version_}.tar.bz2 +# There is no real tarball, hence I did +# +# git clone git://boinc.berkeley.edu/boinc.git +# git checkout master +# git checkout -t client_release/7.2/7.2.42 +# +# then I created an archive via git +# +# git archive -v --format=tar --prefix=boinc-7.2.42/ \ +# client_release/7.2/7.2.42 | bzip2 >../boinc-7.2.42.tar.bz2 +Source0: boinc-%{version}.tar.bz2 Source1: boinc-icons.tar.bz2 Source2: boinc-gui.desktop Source3: README.SUSE @@ -43,86 +49,70 @@ # The source for this package was pulled from upstream's vcs. Use the # following commands to generate the tarball: # -# ./generate-tarball.sh boinc_core_release_%{version_} +# ./generate-tarball.sh boinc_core_release_VERSION # # Trim all binaries and other unnecessary things. Source8: generate-tarball.sh -Source10: %{name}.init -Source20: boinc-client-systemd +Source20: %{name}.service Source100: %{name}-rpmlintrc - # PATCH-FIX-OPENSUSE boinc-guirpcauth.patch # Create password file rw for group, this enables passwordless connection # of manager from users of the boinc group. # This won't be probably upstreamed as it might be unsafe for common usage # without setting proper group ownership of the password file. Patch0: boinc-guirpcauth.patch -# PATCH-FIX-OPENSUSE boinc-init.patch -Patch1: boinc-init.patch # PATCH-FIX-OPENSUSE boinc-LC_MESSAGES.patch Patch2: boinc-LC_MESSAGES.patch -# PATCH-FIX-OPENSUSE boinc-completion.patch -Patch3: boinc-completion.patch # PATCH-FIX-OPENSUSE boinc-docbook2x.patch Patch4: boinc-docbook2x.patch -# PATCH-FIX-OPENSUSE [email protected] use asprintf to fix buffer overflow -Patch5: boinc-client-7.0.36-dynamic_buffers.patch # PATCH-FIX-OPENSUSE coolo - #error: am__fastdepOBJCXX does not appear in AM_CONDITIONAL -Patch7: boinc-client-7.0.36-AM_CONDITIONAL.patch -# -BuildRoot: %{_tmppath}/%{name}-%{version}-build - -Requires(pre): pwdutils -%if 0%{?suse_version} < 1230 -Requires(pre): %insserv_prereq -Requires(pre): %fillup_prereq -%else -BuildRequires: pkgconfig(systemd) -%{?systemd_requires} -%endif - +Patch7: %{name}-AM_CONDITIONAL.patch +# PATCH-FIX-OPENSUSE computersalat - error: +# configure.ac:898: required file `test/version.inc.in' not found +# configure.ac:898: required file `py/Boinc/version.py.in' not found +Patch8: boinc-configure.patch BuildRequires: Mesa-devel -#BuildRequires: autoconf -#BuildRequires: automake BuildRequires: docbook2x BuildRequires: docbook_4 -BuildRequires: update-desktop-files -#BuildRequires: fcgi-devel BuildRequires: fdupes BuildRequires: freeglut-devel BuildRequires: gcc-c++ BuildRequires: gcc-fortran BuildRequires: gettext-runtime -#BuildRequires: gnutls-devel BuildRequires: libcurl-devel >= 7.17.1 BuildRequires: libjpeg-devel BuildRequires: libnotify-devel BuildRequires: libtool BuildRequires: libxslt -#BuildRequires: m4 -#BuildRequires: make BuildRequires: mysql-devel BuildRequires: openssl-devel -#BuildRequires: patch BuildRequires: pkg-config BuildRequires: pwdutils BuildRequires: python-mysql BuildRequires: sqlite3-devel +BuildRequires: systemd +BuildRequires: update-desktop-files +BuildRequires: wxWidgets-devel >= 2.8.0 BuildRequires: xorg-x11-libXmu-devel -%if 0%{?suse_version} <= 1130 -BuildRequires: wxGTK-devel >= 2.6.0 -%else -BuildRequires: wxWidgets-devel >= 2.8.7 -%endif - Requires: cron -Requires: logrotate ### FIXME: ## updating boinc-client or boinc-manager does not update libboinc6 ## hence we define this dependency ## !! Do not remove this dependency !! Requires: libboinc%{soname} = %{version}-%{release} - +Recommends: boinc-client-lang = %{version} +Requires: logrotate +Requires(pre): pwdutils +BuildRoot: %{_tmppath}/%{name}-%{version}-build +%{?systemd_requires} +%if 0%{?suse_version} >= 1310 +BuildRequires: libXScrnSaver-devel +BuildRequires: libXi-devel +BuildRequires: libxcb-devel +BuildRequires: xcb-util-devel +%else +BuildRequires: xorg-x11-libxcb-devel +%endif %lang_package %lang_package -n boinc-manager @@ -144,7 +134,7 @@ %package -n boinc-manager Summary: GUI to control and monitor boinc-client Group: Productivity/Scientific/Astronomy -Requires: boinc-manager-lang = %{version}-%{release} +Recommends: boinc-manager-lang = %{version} Requires: hicolor-icon-theme %description -n boinc-manager @@ -178,59 +168,49 @@ %package doc Summary: Documentation files for %{name} Group: Documentation/Other -%if 0%{?suse_version} >= 1120 BuildArch: noarch -%endif %description doc This package contains documentation files for %{name}. %prep -%setup -q -n boinc_core_release_%{version_} -D -a 1 +%setup -q -n boinc-%{version} -D -a 1 %patch0 -%patch1 %patch2 -%patch3 %patch4 -%patch5 -%if 0%{?suse_version} >= 1220 %patch7 -%endif +%patch8 # Install user hints -%{__install} -m0644 %{S:3} README.SUSE +install -m0644 %{SOURCE3} README.SUSE # Fix lang directories (refer patch2) -%{__mv} locale/pt_PT locale/pt -%{__mv} locale/sv_SE locale/sv +mv locale/pt_PT locale/pt +mv locale/sv_SE locale/sv # fix warning: deprecated conversion from string constant to 'char*' pushd clientgui/common/ -%{__sed} -i 's/static char/static const char/g' wxFlatNotebookImages.h +sed -i 's/static char/static const char/g' wxFlatNotebookImages.h popd pushd clientgui/res/ -%{__sed} -i 's/static char/static const char/g' *.xpm +sed -i 's/static char/static const char/g' *.xpm popd pushd clientgui/res/skins/default/graphic/ -%{__sed} -i 's/static char/static const char/g' *.xpm +sed -i 's/static char/static const char/g' *.xpm popd # fix utf8 -iconv -f ISO88591 -t UTF8 < checkin_notes > checkin_notes.utf8 -touch -r checkin_notes checkin_notes.utf8 -mv checkin_notes.utf8 checkin_notes - -iconv -f ISO88591 -t UTF8 < checkin_notes_2004 > checkin_notes_2004.utf8 -touch -r checkin_notes_2004 checkin_notes_2004.utf8 -mv checkin_notes_2004.utf8 checkin_notes_2004 - iconv -f ISO88591 -t UTF8 < checkin_notes_2005 > checkin_notes_2005.utf8 touch -r checkin_notes_2005 checkin_notes_2005.utf8 mv checkin_notes_2005.utf8 checkin_notes_2005 -iconv -f ISO88591 -t UTF8 < checkin_notes_2006 > checkin_notes_2006.utf8 -touch -r checkin_notes_2006 checkin_notes_2006.utf8 -mv checkin_notes_2006.utf8 checkin_notes_2006 +iconv -f ISO88591 -t UTF8 < checkin_notes_2009 > checkin_notes_2009.utf8 +touch -r checkin_notes_2009 checkin_notes_2009.utf8 +mv checkin_notes_2009.utf8 checkin_notes_2009 + +iconv -f ISO88591 -t UTF8 < checkin_notes_2010 > checkin_notes_2010.utf8 +touch -r checkin_notes_2010 checkin_notes_2010.utf8 +mv checkin_notes_2010.utf8 checkin_notes_2010 # fix permissions and newlines on source files chmod 644 clientgui/{DlgItemProperties.h,AsyncRPC.cpp,DlgItemProperties.cpp} @@ -240,13 +220,13 @@ ## remove files with questionable licenses # removing NVIDIA owned file that does not clearly allow redistribution or # modification -%{__rm} coprocs/NVIDIA/include/nvapi.h +rm coprocs/NVIDIA/include/nvapi.h # removing unnecessary APSL licensed files -%{__rm} client/app_stats_mac.cpp +rm client/app_stats_mac.cpp %build #remove run libtoolize and ./_autosetup -/usr/bin/libtoolize --force +%{_bindir}/libtoolize --force ./_autosetup %configure \ @@ -259,12 +239,12 @@ --with-x # Disable rpaths -%{__sed} -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool -%{__sed} -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool +sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool +sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool # Export Path and make -%{__make} clean -%{__make} libboinc_la_LIBADD="-L%{_libdir} -lssl -ldl" \ +make clean %{?_smp_mflags} +make libboinc_la_LIBADD="-L%{_libdir} -lssl -ldl" \ CFLAGS="%{optflags} -g -W -pipe -fno-strict-aliasing -D_REENTRANT" \ CXXFLAGS="%{optflags} -g -W -pipe -fno-strict-aliasing -D_REENTRANT" \ DESTDIR=%{_prefix} %{?_smp_mflags} @@ -276,112 +256,95 @@ # # hence we jump into clientgui and build it manually pushd clientgui -%{__make} libboinc_la_LIBADD="-L%{_libdir} -lssl -ldl" \ -%if 0%{?suse_version} >= 1210 +make libboinc_la_LIBADD="-L%{_libdir} -lssl -ldl" \ CFLAGS="%{optflags} -g -W -pipe -fno-strict-aliasing -D_REENTRANT -lgtk-x11-2.0" \ CXXFLAGS="%{optflags} -g -W -pipe -fno-strict-aliasing -D_REENTRANT -lgtk-x11-2.0" \ -%else - CFLAGS="%{optflags} -g -W -pipe -fno-strict-aliasing -D_REENTRANT" \ - CXXFLAGS="%{optflags} -g -W -pipe -fno-strict-aliasing -D_REENTRANT" \ -%endif DESTDIR=%{_prefix} %{?_smp_mflags} popd pushd locale -%{__make} +make %{?_smp_mflags} popd %install -%{makeinstall} +make DESTDIR=%{buildroot} install %{?_smp_mflags} for i in clientgui locale; do pushd $i -%{makeinstall} + make DESTDIR=%{buildroot} install %{?_smp_mflags} popd done # Creates default folders -%{__install} -dm0755 %{buildroot}%{boinc_dir} -%{__install} -dm0755 %{buildroot}%{_mandir}/man1 +install -dm0755 %{buildroot}%{boinc_dir} +install -dm0755 %{buildroot}%{_mandir}/man1 # Remove old boinc & rename boinc_client to boinc-client -%{__rm} -f %{buildroot}%{_bindir}/boinc -%{__mv} -f %{buildroot}%{_bindir}/boinc_client %{buildroot}%{_bindir}/%{name} +rm -f %{buildroot}%{_bindir}/boinc +mv -f %{buildroot}%{_bindir}/boinc_client %{buildroot}%{_bindir}/%{name} # Rename boincmgr and wrap it -%{__mv} %{buildroot}%{_bindir}/boincmgr %{buildroot}%{_bindir}/boinc-gui +mv %{buildroot}%{_bindir}/boincmgr %{buildroot}%{_bindir}/boinc-gui # Install boinc-manager wrapper script -%{__install} -Dm0755 %{S:6} %{buildroot}%{_bindir}/boinc-manager +install -Dm0755 %{SOURCE6} %{buildroot}%{_bindir}/boinc-manager # Use symlink instead of hardlink pushd %{buildroot}%{_bindir} -%{__ln_s} -f %{name} boinc -%{__ln_s} -f boinc-manager boincmgr -%{__ln_s} -f boinc-manager boincmanager +ln -s -f %{name} boinc +ln -s -f boinc-manager boincmgr +ln -s -f boinc-manager boincmanager popd # replace @boinc_dir@, @bindir@ -%{__sed} -i \ +sed -i \ -e "s,@boinc_dir@,%{boinc_dir},g" \ -e "s,@bindir@,%{_bindir},g" \ %{buildroot}%{_bindir}/boinc-manager # Remove /etc/sysconfig/boinc-client, it is added by %%fillup_and_insserv -%{__rm} -f %{buildroot}%{_sysconfdir}/sysconfig/%{name} +rm -f %{buildroot}%{_sysconfdir}/sysconfig/%{name} -# Install init and create symlink to /etc/init.d/boinc-client -%if 0%{?suse_version} >=1230 -chmod -x %{S:20} -%{__install} -Dm0755 %{S:20} %{buildroot}%{_unitdir}/%{name}.service +# Install init and create symlink for rcboinc +install -D -m0644 %{SOURCE20} %{buildroot}%{_unitdir}/%{name}.service +mkdir -p %{buildroot}%{_sbindir} +ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name} # And remove sysvinit script installed by boinc -rm -r %{buildroot}/%{_initrddir} -%else -%{__install} -Dm0755 %{S:10} %{buildroot}%{_initrddir}/%{name} -%{__install} -dm0755 %{buildroot}%{_sbindir} -/bin/ln -sf %{_sysconfdir}/init.d/%{name} %{buildroot}%{_sbindir}/rc%{name} - -# Install template for sysconfig -%{__install} -Dm0644 %{S:4} %{buildroot}/var/adm/fillup-templates/sysconfig.%{name} -%endif +rm -r %{buildroot}/%{_initddir} # Install logrotate -%{__install} -Dm0644 %{S:5} %{buildroot}%{_sysconfdir}/logrotate.d/%{name} +install -Dm0644 %{SOURCE5} %{buildroot}%{_sysconfdir}/logrotate.d/%{name} # Install bash completion -%{__install} -Dpm0644 client/scripts/boinc.bash %{buildroot}%{_sysconfdir}/bash_completion.d/boinc +install -Dpm0644 client/scripts/boinc.bash %{buildroot}%{_sysconfdir}/bash_completion.d/boinc # Install desktop-file and icons -%{__install} -Dm0644 boinc-gui-128.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/boinc-gui.png -%{__install} -Dm0644 boinc-gui-64.png %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/boinc-gui.png -%{__install} -Dm0644 boinc-gui-48.png %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/boinc-gui.png -%{__install} -Dm0644 boinc-gui-32.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/boinc-gui.png -%{__install} -Dm0644 boinc-gui-22.png %{buildroot}%{_datadir}/icons/hicolor/22x22/apps/boinc-gui.png -%{__install} -Dm0644 boinc-gui-16.png %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/boinc-gui.png +install -Dm0644 boinc-gui-128.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/boinc-gui.png +install -Dm0644 boinc-gui-64.png %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/boinc-gui.png +install -Dm0644 boinc-gui-48.png %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/boinc-gui.png +install -Dm0644 boinc-gui-32.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/boinc-gui.png +install -Dm0644 boinc-gui-22.png %{buildroot}%{_datadir}/icons/hicolor/22x22/apps/boinc-gui.png +install -Dm0644 boinc-gui-16.png %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/boinc-gui.png # install icons -%{__install} -m0644 clientgui/res/boincmgr.16x16.png %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/boincmanager.png -%{__install} -m0644 clientgui/res/boincmgr.32x32.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/boincmanager.png -%{__install} -m0644 clientgui/res/boincmgr.48x48.png %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/boincmanager.png +install -m0644 clientgui/res/boincmgr.16x16.png %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/boincmanager.png +install -m0644 clientgui/res/boincmgr.32x32.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/boincmanager.png +install -m0644 clientgui/res/boincmgr.48x48.png %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/boincmanager.png # Install *.desktop File %suse_update_desktop_file -i boinc-gui Utility -# Remove libtool archives -%{__rm} %{buildroot}%{_libdir}/*.la -# Remove static libraries -%{__rm} %{buildroot}%{_libdir}/*.a +# Remove static libraries, libtool archives +rm %{buildroot}%{_libdir}/*.{a,la} + # Relinking Manpages -%{__ln_s} -f boincmgr.1.gz %{buildroot}%{_mandir}/man1/boinc-manager.1.gz -%{__ln_s} -f boinccmd.1.gz %{buildroot}%{_mandir}/man1/boinccmd.1.gz -%{__ln_s} -f boinc.1.gz %{buildroot}%{_mandir}/man1/boinc.1.gz +ln -s -f boincmgr.1.gz %{buildroot}%{_mandir}/man1/boinc-manager.1.gz +ln -s -f boinccmd.1.gz %{buildroot}%{_mandir}/man1/boinccmd.1.gz +ln -s -f boinc.1.gz %{buildroot}%{_mandir}/man1/boinc.1.gz # Fix spurious-executable-perm -%{__chmod} 0644 doc/*.php - -# Don't pick INSTALL file in %doc macro - +chmod 0644 doc/*.php # Install fake /var/lib/boinc -%{__install} -dm0755 %{buildroot}%{_var}/lib/boinc +install -dm0755 %{buildroot}%{_var}/lib/boinc # Prepare $LANG Packages %find_lang BOINC-Client @@ -396,42 +359,30 @@ %{_sbindir}/useradd -c "BOINC Client" -d "%{_localstatedir}/lib/boinc" \ -g boinc -r -s /sbin/nologin boinc 2>/dev/null || : if [ -f %{_sysconfdir}/sysconfig/%{name} ]; then - if [ "$(grep "BOINC_BOINC_USR" /etc/sysconfig/boinc-client | grep -v grep >/dev/null; echo $?)" == 1 ]; then + if [ "$(grep "BOINC_BOINC_USR" %{_sysconfdir}/sysconfig/boinc-client | grep -v grep >/dev/null; echo $?)" == 1 ]; then mv -f %{_sysconfdir}/sysconfig/%{name} %{_sysconfdir}/sysconfig/%{name}.save fi fi +%service_add_pre %{name}.service %preun -%if 0%{?suse_version} >=1230 %service_del_preun %{name}.service -%else -%stop_on_removal %{name} -%endif %post -%if 0%{?suse_version} >=1230 %service_add_post %{name}.service -%else -%fillup_and_insserv %{name} -%endif %{_sbindir}/usermod -c "BOINC Client" -s /sbin/nologin boinc 2>/dev/null || : %postun -%if 0%{?suse_version} >=1230 -%service_del_postun -%else -%restart_on_update %{name} -%insserv_cleanup -%endif +%service_del_postun %{name}.service %post -n boinc-manager -/usr/bin/touch --no-create %{_datadir}/icons/hicolor || : +%{_bindir}/touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %postun -n boinc-manager -/usr/bin/touch --no-create %{_datadir}/icons/hicolor || : +%{_bindir}/touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi @@ -446,22 +397,18 @@ %files %defattr(-,root,root,-) -%doc COPYING* COPYRIGHT notes todo TODO_OLD README.SUSE +%doc COPYING* COPYRIGHT notes todo README.SUSE %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %config(noreplace) %{_sysconfdir}/bash_completion.d/* -%if 0%{?suse_version} >=1230 -%{_unitdir}/%{name}.service -%else -/var/adm/fillup-templates/sysconfig.%{name} -%{_sbindir}/rc%{name} -%{_initrddir}/%{name} -%endif %{_bindir}/boinc %{_bindir}/%{name} %{_bindir}/boinccmd +%{_bindir}/boincscr %{_bindir}/switcher %{_mandir}/man1/boinccmd.1.gz %{_mandir}/man1/boinc.1.gz +%{_unitdir}/%{name}.service +%{_sbindir}/rc%{name} %defattr(-,boinc,boinc,-) %{_localstatedir}/lib/boinc/ @@ -482,8 +429,10 @@ %{_mandir}/man1/boinc-manager.1.gz %files -n %{name}-lang -f BOINC-Client.lang +%defattr(-,root,root) %files -n boinc-manager-lang -f BOINC-Manager.lang +%defattr(-,root,root) %files -n libboinc%{soname} %defattr(-,root,root,-) ++++++ README.SUSE ++++++ --- /var/tmp/diff_new_pack.8wZWGn/_old 2014-06-26 15:07:20.000000000 +0200 +++ /var/tmp/diff_new_pack.8wZWGn/_new 2014-06-26 15:07:20.000000000 +0200 @@ -34,8 +34,8 @@ What the installer does 1. Creates the daemon script at /etc/init.d/boinc-client. - 2. Places the BOINC binaries (boinc_client, boinc_cmd and boincmgr) - in /usr/bin/. + 2. Places the BOINC binaries (boinc-client, boinccmd, boinc-gui + and boincmgr) in /usr/bin/. 3. Creates /var/lib/boinc/ for BOINC data files and the slots and projects directories. 4. Names the daemon boinc-client. @@ -52,7 +52,7 @@ 2. If you elected to not have Linux start the daemon at boot time, start the daemon manually with |/sbin/service boinc-client start| 3. Open a terminal and enter |ps aux | grep boinc| to print a partial - list of running processes. You should see |boinc_client --daemon| + list of running processes. You should see |boinc-client --dir ...| in that list, if not then something went wrong in the steps above. @@ -95,7 +95,7 @@ directory without becoming root. As you type in each command below, substitute your Linux username wherever you see |username|. Enter the following commands in a terminal, as root: - 1. |/usr/sbin/usermod -G boinc -a username| + 1. |/usr/sbin/usermod -A boinc username| 2. |chmod g+rw /var/lib/boinc| 3. |chmod g+rw /var/lib/boinc/*.*| 4. |ln -s /var/lib/boinc/gui_rpc_auth.cfg ++++++ boinc-LC_MESSAGES.patch ++++++ --- /var/tmp/diff_new_pack.8wZWGn/_old 2014-06-26 15:07:20.000000000 +0200 +++ /var/tmp/diff_new_pack.8wZWGn/_new 2014-06-26 15:07:20.000000000 +0200 @@ -3,18 +3,18 @@ --- locale/Makefile.am.orig +++ locale/Makefile.am @@ -45,12 +45,12 @@ locale_dirs = \ - install-exec-hook: + install-data-hook: mydir=$(DESTDIR)$(datadir) ;\ for ldir in $(locale_dirs) ; do \ - $(INSTALL) -d $$mydir/$$ldir ; \ + $(INSTALL) -d $$mydir/$$ldir/LC_MESSAGES ; \ if [ -f $$ldir/BOINC-Manager.mo ] ; then \ -- $(INSTALL) $$ldir/BOINC-Manager.mo $$mydir/$$ldir/BOINC-Manager.mo ; \ -+ $(INSTALL) $$ldir/BOINC-Manager.mo $$mydir/$$ldir/LC_MESSAGES/BOINC-Manager.mo ; \ +- $(INSTALL_DATA) $$ldir/BOINC-Manager.mo $$mydir/$$ldir/BOINC-Manager.mo ; \ ++ $(INSTALL_DATA) $$ldir/BOINC-Manager.mo $$mydir/$$ldir/LC_MESSAGES/BOINC-Manager.mo ; \ fi ;\ if [ -f $$ldir/BOINC-Client.mo ] ; then \ -- $(INSTALL) $$ldir/BOINC-Client.mo $$mydir/$$ldir/BOINC-Client.mo ; \ -+ $(INSTALL) $$ldir/BOINC-Client.mo $$mydir/$$ldir/LC_MESSAGES/BOINC-Client.mo ; \ +- $(INSTALL_DATA) $$ldir/BOINC-Client.mo $$mydir/$$ldir/BOINC-Client.mo ; \ ++ $(INSTALL_DATA) $$ldir/BOINC-Client.mo $$mydir/$$ldir/LC_MESSAGES/BOINC-Client.mo ; \ fi ;\ done ++++++ boinc-client-AM_CONDITIONAL.patch ++++++ Index: configure.ac =================================================================== --- configure.ac.orig +++ configure.ac @@ -45,6 +45,7 @@ m4_ifdef([AC_PROG_OBJCXX],[AC_PROG_OBJCX dnl ------ AC_PROG_F77 AC_PROG_CPP +AC_PROG_OBJCXX AC_PROG_MAKE_SET SAH_LINKS AC_LANG_PUSH(C) @@ -793,6 +794,8 @@ AM_CONDITIONAL(ENABLE_LIBRARIES, [test " AM_CONDITIONAL(INSTALL_HEADERS, [test "${enable_install_headers}" = yes]) AM_CONDITIONAL(HAVE_CUDA_LIB, [test "${enable_client}" = yes -a -f ./coprocs/CUDA/posix/${boinc_platform}/libcudart.so]) +PKG_CHECK_MODULES([GTK2], [gtk+-2.0]) + dnl ====================================================================== dnl some more vodoo required for building portable client-binary (client, clientgui) dnl ====================================================================== Index: clientgui/Makefile.am =================================================================== --- clientgui/Makefile.am.orig +++ clientgui/Makefile.am @@ -117,9 +117,8 @@ EXTRA_DIST = *.h \ ../lib/error_numbers.h \ locale $(mac_headers) -boincmgr_CPPFLAGS = $(AM_CPPFLAGS) $(WX_CPPFLAGS) $(SQLITE3_CPPFLAGS) $(LIBNOTIFY_CFLAGS) $(CLIENTGUIFLAGS) `pkg-config --cflags gtk+-2.0` -boincmgr_CXXFLAGS = $(AM_CXXFLAGS) $(WX_CXXFLAGS) $(SQLITE3_CPPFLAGS) $(LIBNOTIFY_CFLAGS) $(CLIENTGUIFLAGS) `pkg-config --cflags gtk+-2.0` -boincmgr_LDFLAGS = $(LIBBOINC) $(SQLITE3_LIBS) $(LIBNOTIFY_LIBS) $(CLIENTGUILIBS) $(BOINC_EXTRA_LIBS) $(CLIENTLIBS) `pkg-config --libs gtk+-2.0` -lnotify +boincmgr_CPPFLAGS = $(AM_CPPFLAGS) $(WX_CPPFLAGS) $(SQLITE3_CPPFLAGS) $(LIBNOTIFY_CFLAGS) $(CLIENTGUIFLAGS) $(GTK2_CFLAGS) +boincmgr_LDFLAGS = $(LIBBOINC) $(SQLITE3_LIBS) $(LIBNOTIFY_LIBS) $(CLIENTGUILIBS) $(BOINC_EXTRA_LIBS) $(CLIENTLIBS) $(GTK2_LIBS) -lnotify win_config.h: $(top_srcdir)/config.h grep '#define.*BOINC.*VERSION' $^ > $@ ++++++ boinc-client-rpmlintrc ++++++ --- /var/tmp/diff_new_pack.8wZWGn/_old 2014-06-26 15:07:20.000000000 +0200 +++ /var/tmp/diff_new_pack.8wZWGn/_new 2014-06-26 15:07:20.000000000 +0200 @@ -1,8 +1 @@ -# This line is mandatory to access the configuration functions -from Config import * - -addFilter("suse-branding-unversioned-requires hicolor-icon-theme") -addFilter("non-standard-uid") -addFilter("libdir-macro-in-noarch-package") addFilter("no-manual-page-for-binary") -addFilter("macro-in-comment") ++++++ boinc-client.service ++++++ [Unit] Description=Berkeley Open Infrastructure Network Computing Client After=network.target [Service] Nice=10 User=boinc CPUShares=2 ControlGroup=cpu:/background PermissionsStartOnly=yes ExecStartPre=/bin/sleep 1 ExecStartPre=/usr/bin/touch /var/log/boinc.log /var/log/boincerr.log ExecStartPre=/usr/bin/chown boinc:boinc /var/log/boinc.log /var/log/boincerr.log ExecStart=/usr/bin/boinc --dir /var/lib/boinc ExecReload=/usr/bin/boinccmd --read_cc_config ExecStopPost=/bin/rm -f /var/lib/boinc/lockfile [Install] WantedBy=multi-user.target ++++++ boinc-configure.patch ++++++ Index: configure.ac =================================================================== --- configure.ac.orig +++ configure.ac @@ -968,7 +968,6 @@ AC_CONFIG_FILES([ lib/Makefile locale/Makefile Makefile - py/Boinc/version.py py/Makefile py/boinc_path_config.py:py/boinc_path_config.py.in py/setup.py @@ -990,7 +989,6 @@ AC_CONFIG_FILES([ packages/solaris/CSW/boincmanager/prototype test/boinc_path_config.py:py/boinc_path_config.py.in test/Makefile - test/version.inc tools/boinc_path_config.py:py/boinc_path_config.py.in tools/Makefile vda/Makefile ++++++ boinc-docbook2x.patch ++++++ --- /var/tmp/diff_new_pack.8wZWGn/_old 2014-06-26 15:07:21.000000000 +0200 +++ /var/tmp/diff_new_pack.8wZWGn/_new 2014-06-26 15:07:21.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- configure.ac.orig +++ configure.ac -@@ -285,7 +285,7 @@ AC_SUBST([TOP_BUILD_DIR], [`pwd`]) +@@ -297,7 +297,7 @@ AC_SUBST([TOP_BUILD_DIR], [`pwd`]) dnl Check for docbook2x-man, which we use to create the manpages in dnl doc/manpages, and set the conditional HAVE_DOCBOOK2X_MAN to build dnl the manpages only if docbook2x-man is available. ++++++ boinc-guirpcauth.patch ++++++ --- /var/tmp/diff_new_pack.8wZWGn/_old 2014-06-26 15:07:21.000000000 +0200 +++ /var/tmp/diff_new_pack.8wZWGn/_new 2014-06-26 15:07:21.000000000 +0200 @@ -2,17 +2,17 @@ =================================================================== --- client/gui_rpc_server.cpp.orig +++ client/gui_rpc_server.cpp -@@ -145,12 +145,7 @@ int GUI_RPC_CONN_SET::get_password() { - // they can cause code to execute as this user. - // So better protect it. - // -- if (g_use_sandbox) { -- // Allow group access so authorized administrator can modify it -- chmod(GUI_RPC_PASSWD_FILE, S_IRUSR|S_IWUSR | S_IRGRP | S_IWGRP); -- } else { -- chmod(GUI_RPC_PASSWD_FILE, S_IRUSR|S_IWUSR); -- } -+ chmod(GUI_RPC_PASSWD_FILE, S_IRUSR|S_IWUSR | S_IRGRP | S_IWGRP); +@@ -169,12 +169,7 @@ void GUI_RPC_CONN_SET::get_password() { + // they can cause code to execute as this user. + // So better protect it. + // +- if (g_use_sandbox) { +- // Allow group access so authorized administrator can modify it +- chmod(GUI_RPC_PASSWD_FILE, S_IRUSR|S_IWUSR | S_IRGRP | S_IWGRP); +- } else { +- chmod(GUI_RPC_PASSWD_FILE, S_IRUSR|S_IWUSR); +- } ++ chmod(GUI_RPC_PASSWD_FILE, S_IRUSR|S_IWUSR | S_IRGRP | S_IWGRP); #endif - } - } + } + -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
