[gnumed-server] Update to v16.14

[Michel Alexandre Salim]

commit 0c2425f17947e6db8d75b8212b268fe53e89b300
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date:   Fri Jun 1 13:07:11 2012 +0700

    Update to v16.14
    
    - Revert to installing to default directories; gnumed-server depends on
      gnumed client anyway, and installs symlinks assuming the default
      directory depth
    - Update license field

 .gitignore                      |    3 +-
 gnumed-server-correct-dir.patch |   11 --
 gnumed-server.spec              |   69 ++++++------
 gpl-1.0.txt                     |  251 ---------------------------------------
 sources                         |    2 +-
 5 files changed, 36 insertions(+), 300 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 87ebddc..28a1902 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-/gnumed-server.14.8.tgz
-/gnumed-server.15.5.tgz
+/gnumed-server.16.14.tgz
diff --git a/gnumed-server.spec b/gnumed-server.spec
index 3e841eb..75e4291 100644
--- a/gnumed-server.spec
+++ b/gnumed-server.spec
@@ -1,17 +1,22 @@
+%global major_ver 16
+%global gm_server_dir %{_sharedstatedir}/gnumed/server
+
 Name:		gnumed-server
-Version:	15.5
-Release:	3%{?dist}
+Version:	%{major_ver}.14
+Release:	1%{?dist}
 Summary:	The GNUmed back end server
+%if 0%{?rhel}
 Group:		Applications/Productivity	
-License:	GPLv2+ or GPLv1
+%endif
+License:	GPLv2+
 URL:		http://wiki.gnumed.de/
-Source0:	http://www.gnumed.de/downloads/server/v15/%{name}.%{version}.tgz
-Source1:	http://www.gnu.org/licenses/gpl-1.0.txt	
-Patch0:		gnumed-server-correct-dir.patch
+Source0:	http://www.gnumed.de/downloads/server/v%{major_ver}/%{name}.%{version}.tgz
 BuildArch:  noarch
 
 Requires: python
 Requires: python-psycopg2
+# bootstrap requires files from client package
+Requires: gnumed
 Requires: mailx
 Requires: bzip2
 Requires: gnupg2
@@ -30,37 +35,32 @@ occupational therapists.
 %prep
 %setup -q -n gnumed-server.%{version}
 
-#Patch GM_SERVER_DIR path
-#-GM_SERVER_DIR="/var/lib/gnumed/server/bootstrap"
-#+GM_SERVER_DIR="/usr/lib/gnumed-server/server/bootstrap"
-%patch0 -p1
-
 %build
 
 %install
 pushd server
 
-#Copy to /sharedstatedir/gnumed-server/
-mkdir -p %{buildroot}%{_sharedstatedir}/%{name}
-cp -p -r bootstrap %{buildroot}%{_sharedstatedir}/%{name}
-cp -p -r pycommon %{buildroot}%{_sharedstatedir}/%{name}
-cp -p -r sql %{buildroot}%{_sharedstatedir}/%{name}
-cp __init__.py %{buildroot}%{_sharedstatedir}/%{name}
-echo "%{version}" > %{buildroot}%{_sharedstatedir}/%{name}/version.txt
+#Copy to %%{gm_server_dir}
+mkdir -p %{buildroot}%{gm_server_dir}
+for dirent in bootstrap pycommon sql __init__.py;
+do
+  cp -pr $dirent %{buildroot}%{gm_server_dir}/
+done
+echo "%{version}" > %{buildroot}%{gm_server_dir}/version.txt
 
 # silcence bootstrap process by setting interactive to 'no' and set 'gm-dbo' as default password
-for conffile in `find %{buildroot}/%{_sharedstatedir}/%{name}/bootstrap -maxdepth 1 -type f -name \*.conf` ; do \
-   sed -i 's/^\(interactive[[:space:]]*=[[:space:]]*\)yes/\1no/' "$conffile" ; \
-   sed -i 's/^\(password[[:space:]]*=[[:space:]]*\)/\1 gm-dbo/' "$conffile" ; \
+for conffile in `find %{buildroot}/%{gm_server_dir}/bootstrap -maxdepth 1 -type f -name \*.conf` ; do \
+   sed -i.bak1 's/^\(interactive[[:space:]]*=[[:space:]]*\)yes/\1no/' "$conffile" ; \
+   sed -i.bak 's/^\(password[[:space:]]*=[[:space:]]*\)/\1 gm-dbo/' "$conffile" ; \
 done
 
 
 #copy config files to /etc
-mkdir -p %{buildroot}%{_sysconfdir}/%{name}
+mkdir -p %{buildroot}%{_sysconfdir}/gnumed
 for conf in `ls etc/gnumed/*.conf.example`; 
     do mv $conf `echo $conf|sed 's/.example//'`; 
 done
-cp -p -r etc/gnumed/*.conf %{buildroot}%{_sysconfdir}/%{name}
+cp -p -r etc/gnumed/*.conf %{buildroot}%{_sysconfdir}/gnumed
 
 #create .gz files and copy them to mandir
 mkdir -p %{buildroot}%{_mandir}/man8/
@@ -77,30 +77,29 @@ cp -p doc/*.1.gz %{buildroot}%{_mandir}/man1
 #copy all scripts to bin dir
 mkdir -p %{buildroot}%{_bindir}
 rename ".sh" "" *.sh
-#remove backup files
-rm *.orig
 cp gm-* %{buildroot}%{_bindir}
 
 
-#copy all docs to default doc dir
-mkdir -p %{buildroot}%{_defaultdocdir}/%{name}
-cp -p doc/README %{buildroot}%{_defaultdocdir}/%{name}
-cp -r -p doc/schema %{buildroot}%{_defaultdocdir}/%{name}
-cp -p GnuPublicLicense.txt %{buildroot}%{_defaultdocdir}/%{name}
-
 popd  
 
 
 %files
-%defattr(-,root,root,-)
-%doc %{_defaultdocdir}/%{name}/
-%{_sharedstatedir}/%{name}/
+%doc server/GnuPublicLicense.txt server/doc/README server/doc/schema
+%{gm_server_dir}
+%ghost %{_sharedstatedir}/gnumed/Gnumed
 %{_bindir}/gm-*
 %{_mandir}/man8/gm-*
 %{_mandir}/man1/gm-*
-%config(noreplace) %{_sysconfdir}/%{name}/
+%config(noreplace) %{_sysconfdir}/gnumed/*.conf
 
 %changelog
+* Fri Jun  1 2012 Michel Salim <salimma at fedoraproject.org> - 16.14-1
+- Update to v16.14
+- Revert to installing to default directories; gnumed-server depends on
+  gnumed client anyway, and installs symlinks assuming the default
+  directory depth
+- Update license field
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 15.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sources b/sources
index 47fb627..3335e30 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6ceefb68dfa0f59d13e9426c5b6e630b  gnumed-server.15.5.tgz
+737d4ea5bc06c7e165f934baae36983c  gnumed-server.16.14.tgz