Accepting request 99354 from home:tabraham1:branches:network:utilities

update to 2.9.25

OBS-URL: https://build.opensuse.org/request/show/99354
OBS-URL: https://build.opensuse.org/package/show/network:utilities/nbd?expand=0&rev=15

nbd.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package nbd
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -19,17 +19,18 @@
 
 
 Name:           nbd
-BuildRequires:  doxygen glib2-devel
+BuildRequires:  doxygen glib2-devel >= 2.26.0
 PreReq:         %insserv_prereq coreutils
-Version:        2.9.20
-Release:        2
-License:        GPLv2+
+Version:        2.9.25
+Release:        1
+License:        GPL-2.0+
 Group:          Productivity/Networking/Other
 AutoReqProv:    on
 Source:         %{name}-%{version}.tar.bz2
 Source2:        init.nbd-server
-Patch2:         nbd-2.9.20-close.diff
-Patch3:         nbd-2.9.20-bigendian.diff
+Patch2:         nbd-2.9.25-close.diff
+Patch3:         nbd-2.9.25-doxyfile.diff
+Patch4:         nbd-2.9.25-have_falloc_ph.diff
 Summary:        Network Block Device Server and Client Utilities
 Url:            http://nbd.sourceforge.net/
 Prefix:         /usr
@@ -64,7 +65,7 @@ Authors:
     Paul Clements <Paul.Clements@steeleye.com>
 
 %package doc
-License:        GPLv2+
+License:        GPL-2.0+
 Summary:        Network Block Device Server and Client Utilities
 Group:          Productivity/Networking/Other
 Requires:       nbd = %{version}
@@ -97,6 +98,7 @@ Authors:
 %setup
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -fstack-protector"
@@ -104,10 +106,10 @@ export CFLAGS="$RPM_OPT_FLAGS -fstack-protector"
 	--infodir=%{_infodir} --libdir=%{_libdir} --libexecdir=%{_libdir} \
 	--program-prefix="" --sysconfdir=/etc --build=%{_target_cpu}-suse-linux
 make
-doxygen
+doxygen doc/Doxyfile.in
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT man_MANS='nbd-client.8 nbd-server.1 nbd-server.5'
+make install DESTDIR=$RPM_BUILD_ROOT man_MANS='nbd-client.8 nbd-server.1 nbd-server.5 nbd-trdump.1'
 mkdir -p $RPM_BUILD_ROOT/etc/init.d
 install %SOURCE2 $RPM_BUILD_ROOT/etc/init.d/nbd-server
 mkdir -p $RPM_BUILD_ROOT/usr/bin
@@ -122,13 +124,15 @@ grep -A16 -B1 '^\[generic\]' README > $RPM_BUILD_ROOT/etc/nbd-server/config.exam
 %defattr(-,root,root)
 %attr(0755,root,root) /usr/sbin/nbd-client
 %attr(0755,root,root) /usr/bin/nbd-server
+%attr(0755,root,root) /usr/bin/nbd-trdump
 %attr(0755,root,root) /etc/init.d/nbd-server
 %attr(0755,root,root) /usr/bin/rcnbd-server
 %{_mandir}/man1/nbd-server.1.gz
+%{_mandir}/man1/nbd-trdump.1.gz
 %{_mandir}/man5/nbd-server.5.gz
 %{_mandir}/man8/nbd-client.8.gz
 %doc README
-#%config(noreplace) /etc/nbd-server.conf
+#%%config(noreplace) /etc/nbd-server.conf
 %dir /etc/nbd-server
 %ghost %config(noreplace) /etc/nbd-server/config
 %ghost %config(noreplace) /etc/nbd-server/allow
@@ -161,6 +165,7 @@ fi
 
 %postun
 %{insserv_cleanup}
+%restart_on_update /etc/init.d/nbd-server
 
 %preun
 %{stop_on_removal nbd-server}