From 3bfd6bc657c4048ae8372fc9be2b42ea04fdc95ec2529f1bb7ab19f459d0bc85 Mon Sep 17 00:00:00 2001
From: OBS User buildservice-autocommit <null@suse.de>
Date: Thu, 19 May 2011 11:46:11 +0000
Subject: [PATCH 1/4] Updating link to change in openSUSE:Factory/boinc-client
 revision 17.0

OBS-URL: https://build.opensuse.org/package/show/network/boinc-client?expand=0&rev=e59ea57f0f44097512e7f91d46b4f07f
---
 boinc-client.spec | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/boinc-client.spec b/boinc-client.spec
index 1875820..3c42659 100644
--- a/boinc-client.spec
+++ b/boinc-client.spec
@@ -1,4 +1,7 @@
 #
+# spec file for package boinc-client
+#
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # Copyright (c) 2011 by Sascha Manns <saigkill@opensuse.org>
 #
 # All modifications and additions to the file contributed by third parties
@@ -12,6 +15,7 @@
 
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
+
 # norootforbuild
 
 # Global definitions
@@ -26,7 +30,7 @@ Release:        1
 Summary:        The BOINC client core
 License:        LGPLv2+
 Group:          Productivity/Clustering/Computing
-URL:            http://boinc.berkeley.edu/
+Url:            http://boinc.berkeley.edu/
 
 Source0:        boinc_core_release_%{version_}.tar.bz2
 Source1:        boinc-icons.tar.bz2  
@@ -34,7 +38,7 @@ Source2:        boinc-gui.desktop
 Source3:        README.SUSE
 Source4:        sysconfig.boinc-client
 Source5:        boinc-logrotate
-Source6: 	boincmanager
+Source6:        boincmanager
 Source7:        boinc-client-rpmlintrc 
 # The source for this package was pulled from upstream's vcs. Use the
 # following commands to generate the tarball:
@@ -94,7 +98,7 @@ BuildRequires:  libxslt
 BuildRequires:  mysql-devel
 BuildRequires:  openssl-devel
 #BuildRequires:  patch
-BuildRequires:  pkg-config 
+BuildRequires:  pkg-config
 BuildRequires:  pwdutils
 BuildRequires:  python-mysql
 BuildRequires:  sqlite3-devel
@@ -127,6 +131,8 @@ 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:       %{name} = %{version}-%{release}
@@ -140,9 +146,11 @@ monitoring. The BOINC Manager has two modes of operation, the "Simple View" in
 which it only displays the most important information and the "Advanced View"
 in which all information and all control elements are available.
 
-%lang_package -n boinc-manager
 
+%lang_package -n boinc-manager
 %package devel
+
+
 Summary:        Development files for %{name}
 Group:          Development/Libraries/C and C++
 Requires:       %{name} = %{version}-%{release}
@@ -153,6 +161,8 @@ Requires:       openssl-devel
 This package contains development files for %{name}.
 
 %package -n libboinc%{soname}
+
+
 Summary:        Shared Libs for %{name}
 Group:          System/Libraries
 
@@ -164,6 +174,8 @@ 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
 %if 0%{?suse_version} >= 1120
@@ -314,7 +326,7 @@ getent passwd boinc >/dev/null || \
 useradd -r -g boinc -d %{_localstatedir}/lib/boinc -s /sbin/nologin \
 	-c "BOINC client account." boinc
 exit 0
-   
+
 %post
 %{fillup_and_insserv boinc-client}  
 
@@ -324,7 +336,7 @@ exit 0
 %postun  
 %restart_on_update boinc-client  
 %insserv_cleanup
- 
+
 %post -n boinc-manager
 /usr/bin/touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then

From 35fe1d11bb64fd6d07e807e84488f720ff42d2e6fcfa8d0a1f14e285efd438f7 Mon Sep 17 00:00:00 2001
From: Sascha Manns <Sascha.Manns@outlook.de>
Date: Tue, 30 Aug 2011 18:19:26 +0000
Subject: [PATCH 2/4] - fixed Bug bnc#714623 (/var/lock/subsys unsupported)

OBS-URL: https://build.opensuse.org/package/show/network/boinc-client?expand=0&rev=13
---
 boinc-client.changes   |  5 +++++
 boinc-client.spec      |  2 +-
 boinc-init.patch       | 27 ++++++++++++++++++---------
 sysconfig.boinc-client |  4 ++--
 4 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/boinc-client.changes b/boinc-client.changes
index eadded3..0e7018d 100644
--- a/boinc-client.changes
+++ b/boinc-client.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Aug 30 18:18:14 UTC 2011 - Sascha.Manns@open-slx.de
+
+- fixed Bug bnc#714623 (/var/lock/subsys unsupported) 
+
 -------------------------------------------------------------------
 Mon May 16 18:49:58 CEST 2011 - pth@suse.de
 
diff --git a/boinc-client.spec b/boinc-client.spec
index 3c42659..b676180 100644
--- a/boinc-client.spec
+++ b/boinc-client.spec
@@ -328,7 +328,7 @@ useradd -r -g boinc -d %{_localstatedir}/lib/boinc -s /sbin/nologin \
 exit 0
 
 %post
-%{fillup_and_insserv boinc-client}  
+%fillup_and_insserv boinc-client
 
 %preun
 %stop_on_removal boinc-client  
diff --git a/boinc-init.patch b/boinc-init.patch
index 39a9046..79d042d 100644
--- a/boinc-init.patch
+++ b/boinc-init.patch
@@ -26,7 +26,7 @@ Index: client/scripts/boinc-client.in
  
 +# Name of group to run as:
 +#
-+BOINCGROUP=boinc
++BOINCUSER=boinc
 +
  # Working directory.  Could be /home/boinc, /var/lib/boinc, etc..
  # The reason I prefer /var/lib/boinc is that this works best for a 
@@ -40,7 +40,18 @@ Index: client/scripts/boinc-client.in
  BOINCEXE=${bindir}/${BOINCEXE_NAME}
  BOINCCMD_NAME=boinccmd
  BOINCCMD=${bindir}/${BOINCCMD_NAME}
-@@ -178,8 +182,8 @@ export TERM=dumb
+@@ -161,9 +165,7 @@ BOINCOPTS=
+ # Subsys lock file ...
+ 
+ # If there is the subsys directory, then use it ...
+-if [ -d /var/lock/subsys/ ]; then
+-        LOCKFILE=/var/lock/subsys/${BOINCEXE_NAME}
+-elif [ -d /var/lock ]; then
++if [ -d /var/lock ]; then
+         LOCKFILE=/var/lock/${BOINCEXE_NAME}
+ elif [ -d /var/run ]; then
+         LOCKFILE=/var/run/${BOINCEXE_NAME}.lock
+@@ -178,8 +180,8 @@ export TERM=dumb
  # but if the functions are not found we create our own simple replacements.
  # (The idea for replacing the functions comes from OpenAFS.  Thanks guys!)
  
@@ -51,25 +62,23 @@ Index: client/scripts/boinc-client.in
  else
        if printf "Hello" >/dev/null 2>/dev/null ; then
             # printf works
-@@ -279,7 +283,7 @@ if [ ! -d $BOINCDIR ]; then
+@@ -279,7 +281,7 @@ if [ ! -d $BOINCDIR ]; then
    echo -n "Creating $BOINCDIR "
    if mkdir -p $BOINCDIR 2>/dev/null ; then
      if [ -n "$BOINCUSER" ] ; then
 -      if chown $BOINCUSER $BOINCDIR ; then
-+      if chown $BOINCUSER:$BOINCGROUP $BOINCDIR ; then
++      if chown $BOINCUSER $BOINCGROUP $BOINCDIR ; then
          echo_success
        else
          echo_failure
-@@ -329,8 +333,10 @@ if [ "${USERNOW}" = "${BOINCUSER}" ] ; t
+@@ -329,8 +331,8 @@ if [ "${USERNOW}" = "${BOINCUSER}" ] ; t
      exit 8
    fi
  elif [ "${USERNOW}" = "root" ] ; then
 -  cmd="if test -O ${BOINCDIR} ; then echo success ; fi"
 -  if [ -z `su $BOINCUSER -c "$cmd"` ]; then
-+  #cmd="if test -O ${BOINCDIR} ; then echo success ; fi"
-+  #if [ -z `su $BOINCUSER -c "$cmd"` ]; then
-+    if [ -z `sudo -u $BOINCUSER /bin/sh -c "if test -O ${BOINCDIR} ;
-+    then echo success ; fi"` ]; then
++ # cmd="if test -O ${BOINCDIR} ; then echo success ; fi"
++ # if [ -z `su $BOINCUSER -c "$cmd"` ]; then
      echo -n ERROR: $BOINCDIR is not owned by $BOINCUSER.
      echo_failure
      echo
diff --git a/sysconfig.boinc-client b/sysconfig.boinc-client
index fd76a59..b1a5cc6 100644
--- a/sysconfig.boinc-client
+++ b/sysconfig.boinc-client
@@ -22,8 +22,8 @@ PIDFILE=/var/run/${BOINCEXE_NAME}.pid
 # it will probably be one of the following:
 #LOCKFILE=/var/lock/${BOINCEXE_NAME}
 #LOCKFILE=/var/run/${BOINCEXE_NAME}.lock
-LOCKFILE=/var/lock/subsys/${BOINCEXE_NAME}
-
+#LOCKFILE=/var/lock/subsys/${BOINCEXE_NAME}
+LOCKFILE=/var/lib/tmpfiles.d
 
 # BOINC options: for the command line when running the client.  
 # Be aware that --allow_remote_gui_rpc opens up your machine to the world!

From ec60cc36e982b35e430bf2bfc49ce3678e9a53ead99d66fcaf81fe3740158ded Mon Sep 17 00:00:00 2001
From: Sascha Manns <Sascha.Manns@outlook.de>
Date: Tue, 30 Aug 2011 19:02:12 +0000
Subject: [PATCH 3/4] OBS-URL:
 https://build.opensuse.org/package/show/network/boinc-client?expand=0&rev=14

---
 sysconfig.boinc-client | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sysconfig.boinc-client b/sysconfig.boinc-client
index b1a5cc6..6a5226e 100644
--- a/sysconfig.boinc-client
+++ b/sysconfig.boinc-client
@@ -23,7 +23,7 @@ PIDFILE=/var/run/${BOINCEXE_NAME}.pid
 #LOCKFILE=/var/lock/${BOINCEXE_NAME}
 #LOCKFILE=/var/run/${BOINCEXE_NAME}.lock
 #LOCKFILE=/var/lock/subsys/${BOINCEXE_NAME}
-LOCKFILE=/var/lib/tmpfiles.d
+LOCKFILE=/var/run/${BOINCEXE_NAME}.lock
 
 # BOINC options: for the command line when running the client.  
 # Be aware that --allow_remote_gui_rpc opens up your machine to the world!

From 6f0fad5488a3fcf4bb46f91c350adfd0b22acbfbcc63792ffca8bca8529dc7f1 Mon Sep 17 00:00:00 2001
From: Sascha Manns <Sascha.Manns@outlook.de>
Date: Sun, 2 Oct 2011 15:30:05 +0000
Subject: [PATCH 4/4] Accepting request 85955 from home:coolo:removelibtool

add libtool as buildrequires so we no longer rely on libtool in the project config of factory - it's only needed by <10% of all packages

OBS-URL: https://build.opensuse.org/request/show/85955
OBS-URL: https://build.opensuse.org/package/show/network/boinc-client?expand=0&rev=15
---
 boinc-client.changes | 5 +++++
 boinc-client.spec    | 6 +-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/boinc-client.changes b/boinc-client.changes
index 0e7018d..f72b684 100644
--- a/boinc-client.changes
+++ b/boinc-client.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Sep 30 20:07:45 UTC 2011 - coolo@suse.com
+
+- add libtool as buildrequire to make the spec file more reliable
+
 -------------------------------------------------------------------
 Tue Aug 30 18:18:14 UTC 2011 - Sascha.Manns@open-slx.de
 
diff --git a/boinc-client.spec b/boinc-client.spec
index b676180..08efbdb 100644
--- a/boinc-client.spec
+++ b/boinc-client.spec
@@ -91,7 +91,7 @@ BuildRequires:  gettext-runtime
 #BuildRequires:  gnutls-devel
 BuildRequires:  libcurl-devel >= 7.17.1
 BuildRequires:  libjpeg-devel
-#BuildRequires:  libtool
+BuildRequires:  libtool
 BuildRequires:  libxslt
 #BuildRequires:  m4
 #BuildRequires:  make
@@ -132,7 +132,6 @@ of scientific and mathematical research.
 
 %package -n boinc-manager
 
-
 Summary:        GUI to control and monitor %{name}
 Group:          Productivity/Scientific/Astronomy
 Requires:       %{name} = %{version}-%{release}
@@ -150,7 +149,6 @@ 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/C and C++
 Requires:       %{name} = %{version}-%{release}
@@ -162,7 +160,6 @@ This package contains development files for %{name}.
 
 %package -n libboinc%{soname}
 
-
 Summary:        Shared Libs for %{name}
 Group:          System/Libraries
 
@@ -175,7 +172,6 @@ in which all information and all control elements are available.
 
 %package doc
 
-
 Summary:        Documentation files for %{name}
 Group:          Documentation/Other
 %if 0%{?suse_version} >= 1120