diff --git a/boinc-client.changes b/boinc-client.changes index 04e930e..bb56168 100644 --- a/boinc-client.changes +++ b/boinc-client.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Sun May 1 23:27:45 UTC 2011 - chris@computersalat.de + +- update to 6.10.60 + * Fix: Project list issue in the attach wizard that lead to a crash +- fix deps + o wxGTK-devel +- enable parallel build + ------------------------------------------------------------------- Fri Apr 29 06:11:10 UTC 2011 - saigkill@opensuse.org diff --git a/boinc-client.spec b/boinc-client.spec index 02471c0..a3c8cd2 100644 --- a/boinc-client.spec +++ b/boinc-client.spec @@ -15,95 +15,98 @@ # norootforbuild # Global definitions -%define version_ 6_10_58 +%define _use_internal_dependency_generator 0 +%define __find_requires %wx_requires +%define version_ 6_10_60 %define soname 6 -Name: boinc-client -Version: 6.10.58 -Release: 1 -Summary: The BOINC client core -License: LGPLv2+ -Group: Productivity/Clustering/Computing -URL: http://boinc.berkeley.edu/ +Name: boinc-client +Version: 6.10.60 +Release: 1 +Summary: The BOINC client core +License: LGPLv2+ +Group: Productivity/Clustering/Computing +URL: http://boinc.berkeley.edu/ -Source0: boinc_core_release-%{version_}.tar.bz2 -Source1: boinc-logrotate -Source2: boinc-gui.desktop -Source3: README.SUSE -Source4: sysconfig.boinc-client -Source5: boinc-icons.tar.bz2 +Source0: boinc_core_release_%{version_}.tar.bz2 +Source1: boinc-icons.tar.bz2 +Source2: boinc-gui.desktop +Source3: README.SUSE +Source4: sysconfig.boinc-client +Source5: boinc-logrotate Source6: boincmanager -Source7: boinc-client-rpmlintrc +Source7: boinc-client-rpmlintrc # 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_} # # Trim all binaries and other unnecessary things. -Source8: generate-tarball.sh -Source100: %{name}-rpmlintrc +Source8: generate-tarball.sh +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 +Patch0: boinc-guirpcauth.patch # PATCH-FIX-OPENSUSE boinc-init.patch -Patch1: boinc-init.patch +Patch1: boinc-init.patch # PATCH-FIX-OPENSUSE boinc-LC_MESSAGES.patch -Patch2: boinc-LC_MESSAGES.patch +Patch2: boinc-LC_MESSAGES.patch # PATCH-FIX-OPENSUSE boinc-completion.patch -Patch3: boinc-completion.patch +Patch3: boinc-completion.patch # PATCH-FIX-OPENSUSE boinc-docbook2x.patch -Patch4: boinc-docbook2x.patch +Patch4: boinc-docbook2x.patch # PATCH-FIX-OPENSUSE boinc-server.patch -Patch5: boinc-server.patch +Patch5: boinc-server.patch # PATCH-FIX-OPENSUSE saigkill@opensuse.org adds define HAVE_STRCASESRTR -Patch6: boinc-client-str_util.patch -BuildRequires: libcurl-devel >= 7.17.1 -BuildRequires: python-mysql -BuildRequires: update-desktop-files +Patch6: boinc-client-str_util.patch +# +BuildRoot: %{_tmppath}/%{name}-%{version}-build + +Requires(pre): pwdutils +Requires(pre): %insserv_prereq +Requires(pre): %fillup_prereq + BuildRequires: Mesa-devel +#BuildRequires: autoconf +#BuildRequires: automake +BuildRequires: update-desktop-files +BuildRequires: docbook2x +BuildRequires: docbook_4 +#BuildRequires: fcgi-devel +BuildRequires: fdupes BuildRequires: freeglut-devel -BuildRequires: libopenssl-devel +BuildRequires: gcc-c++ +BuildRequires: gcc-fortran BuildRequires: gettext-runtime +#BuildRequires: gnutls-devel +BuildRequires: libcurl-devel >= 7.17.1 +BuildRequires: libjpeg-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: xorg-x11-libXmu-devel %if 0%{?suse_version} <= 1130 -BuildRequires: wxGTK >= 2.8.7 +BuildRequires: wxGTK-devel >= 2.6.0 %else BuildRequires: wxWidgets-devel >= 2.8.7 %endif -BuildRequires: libjpeg-devel -BuildRequires: libxslt -BuildRequires: xorg-x11-libXmu-devel -BuildRequires: gcc-c++ -BuildRequires: gcc-fortran -BuildRequires: docbook2x -BuildRequires: docbook_4 -BuildRequires: pkg-config -BuildRequires: autoconf -BuildRequires: automake -BuildRequires: libtool -BuildRequires: m4 -BuildRequires: make -BuildRequires: sqlite3-devel -BuildRequires: pwdutils -BuildRequires: patch -BuildRequires: fdupes -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Requires: logrotate +Requires: cron +#Requires: libboinc%{soname} = %{version}-%{release} - -Requires(pre): pwdutils -Requires(pre): %insserv_prereq -Requires(pre): %fillup_prereq - -Requires: logrotate -Requires: cron -Requires: libboinc%{soname} = %{version}-%{release} -%define _use_internal_dependency_generator 0 -%define __find_requires %wx_requires %lang_package %description @@ -122,12 +125,11 @@ global warming, discover sources of gravitational waves, and many other types of scientific and mathematical research. %package -n boinc-manager -Summary: GUI to control and monitor %{name} -Group: Productivity/Scientific/Astronomy - -Requires: hicolor-icon-theme -Requires: %{name} = %{version}-%{release} -Requires: boinc-manager-lang = %{version}-%{release} +Summary: GUI to control and monitor %{name} +Group: Productivity/Scientific/Astronomy +Requires: %{name} = %{version}-%{release} +Requires: boinc-manager-lang = %{version}-%{release} +Requires: hicolor-icon-theme %description -n boinc-manager The BOINC Manager is a graphical monitor and control utility for the BOINC @@ -139,19 +141,18 @@ in which all information and all control elements are available. %lang_package -n boinc-manager %package devel -Summary: Development files for %{name} -Group: Development/Libraries/Other - -Requires: %{name} = %{version}-%{release} -Requires: openssl-devel -Requires: mysql-devel +Summary: Development files for %{name} +Group: Development/Libraries/C and C++ +Requires: %{name} = %{version}-%{release} +Requires: mysql-devel +Requires: openssl-devel %description devel This package contains development files for %{name}. %package -n libboinc%{soname} -Summary: Shared Libs for %{name} -Group: Productivity/Scientific/Astronomy +Summary: Shared Libs for %{name} +Group: System/Libraries %description -n libboinc%{soname} The BOINC Manager is a graphical monitor and control utility for the BOINC @@ -161,18 +162,17 @@ which it only displays the most important information and the "Advanced View" in which all information and all control elements are available. %package doc -Summary: Documentation files for %{name} -Group: Documentation/Other +Summary: Documentation files for %{name} +Group: Documentation/Other %if 0%{?suse_version} >= 1120 -BuildArch: noarch +BuildArch: noarch %endif -Requires: %{name} = %{version}-%{release} %description doc This package contains documentation files for %{name}. %prep -%setup -q -n boinc_core_release_%{version_} +%setup -q -n boinc_core_release_%{version_} -D -a 1 %patch0 %patch1 %patch2 @@ -181,9 +181,6 @@ This package contains documentation files for %{name}. %patch5 %patch6 -# Unpack icons -%{__tar} -xvjf %{S:5} - # Install user hints %{__install} -m0644 %{S:3} README.SUSE @@ -208,14 +205,14 @@ popd /usr/bin/libtoolize --force ./_autosetup -%configure --disable-dependency-tracking \ - --enable-dynamic-client-linkage \ - --disable-server \ - --disable-fcgi \ - --enable-unicode \ - --with-ssl \ - --with-x \ - --disable-static +%configure \ + --disable-static \ + --enable-dynamic-client-linkage \ + --disable-server \ + --disable-fcgi \ + --enable-unicode \ + --with-ssl \ + --with-x # Disable rpaths %{__sed} -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool @@ -223,10 +220,10 @@ popd # Export Path and make %{__make} clean -%{__make} libboinc_la_LIBADD="-lssl -ldl" \ +%{__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} + DESTDIR=%{_prefix} %{?_smp_mflags} %install %{makeinstall} @@ -261,7 +258,7 @@ popd # Install logrotate and create symlink to /etc/init.d/boinc-client %{__install} -dm0755 %{buildroot}%{_sbindir} /bin/ln -sf %{_sysconfdir}/init.d/boinc-client %{buildroot}%{_sbindir}/rcboinc-client -%{__install} -Dm0644 %{S:1} %{buildroot}%{_sysconfdir}/logrotate.d/%{name} +%{__install} -Dm0644 %{S:5} %{buildroot}%{_sysconfdir}/logrotate.d/%{name} # Install bash completition %{__install} -Dpm0644 client/scripts/boinc.bash %{buildroot}%{_sysconfdir}/bash_completion.d/boinc diff --git a/boinc_core_release-6_10_58.tar.bz2 b/boinc_core_release-6_10_58.tar.bz2 deleted file mode 100644 index 7884ea2..0000000 --- a/boinc_core_release-6_10_58.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6b51785ab609c46b30b1f0ee675cdb8de9f624a19fab98ac6f4964b217913676 -size 18313666 diff --git a/boinc_core_release_6_10_60.tar.bz2 b/boinc_core_release_6_10_60.tar.bz2 new file mode 100644 index 0000000..8c2e3d3 --- /dev/null +++ b/boinc_core_release_6_10_60.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dcfbf80fe432d3332f9a407e8a014234840431b5e97f562db204790c80321189 +size 17848931