From f15c1d1b96f05713aa459d89ccb7a88ba5ac93a6 Mon Sep 17 00:00:00 2001
From: opensides <opensides@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Fri, 14 May 2010 00:00:16 +0000
Subject: [PATCH] - Correct errors when building RPM packages Closes #957
 Closes #970

git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.6@18402 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 gosa-core/redhat/gosa.spec     | 10 +++++++++-
 gosa-core/redhat/rpm-make-gosa |  9 +++++----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/gosa-core/redhat/gosa.spec b/gosa-core/redhat/gosa.spec
index 0bd16244c..08e2b36eb 100644
--- a/gosa-core/redhat/gosa.spec
+++ b/gosa-core/redhat/gosa.spec
@@ -243,6 +243,7 @@ mkdir -p %{buildroot}/usr/sbin
 mkdir -p %{buildroot}/usr/share/pixmaps
 mkdir -p %{buildroot}/usr/share/applications
 mkdir -p %{buildroot}/usr/share/man/man1/
+mkdir -p %{buildroot}/usr/share/man/man5/
 
 mv contrib/desktoprc 		%{buildroot}/etc/gosa
 mv contrib/gosa 		%{buildroot}/usr/bin
@@ -251,7 +252,7 @@ mv debian/gosa-16.xpm 		%{buildroot}/usr/share/pixmaps
 mv debian/gosa-desktop.desktop 	%{buildroot}/usr/share/applications
 
 # Gzip manpages from source
-for x in update-gosa.1 dh-make-gosa.1 update-locale.1 update-online-help.1 update-pdf-help.1
+for x in update-gosa.1 dh-make-gosa.1 update-locale.1 update-online-help.1 update-pdf-help.1 gosa-encrypt-passwords.1
 do
 	gzip $x
 done
@@ -274,6 +275,8 @@ done
 mv ./*.1.gz 			%{buildroot}/usr/share/man/man1/
 gzip -c contrib/gosa.1 > contrib/gosa.1.gz
 mv contrib/gosa.1.gz 		%{buildroot}/usr/share/man/man1/
+gzip -c contrib/gosa.conf.5 > contrib/gosa.conf.5.gz
+mv contrib/gosa.conf.5.gz 		%{buildroot}/usr/share/man/man5/
 
 mkdir -p %{buildroot}/usr/share/doc/gosa-%{version}
 rm -rf %{buildroot}/usr/share/gosa/contrib
@@ -310,7 +313,9 @@ rm -rf %{buildroot}
 #%attr(-,root,root) /contrib/openldap
 %config %attr(-,root,root) /usr/share/doc/gosa/slapd.conf-example
 %attr(755,root,root) /usr/sbin/update-gosa
+%attr(755,root,root) /usr/share/man/man1/gosa-encrypt-passwords.1.gz
 %attr(755,root,root) /usr/share/man/man1/update-gosa.1.gz
+%attr(755,root,root) /usr/share/man/man5/gosa.conf.5.gz
 %attr(644,root,root) /etc/gosa/shells
 %attr(644,root,root) /etc/gosa/encodings
 %attr(755,root,root) /usr/sbin/gosa-encrypt-passwords
@@ -389,3 +394,6 @@ rm -rf %{buildroot}
 %changelog
 * Fri Nov 17 2008 Stefan Japes <japes@GONICUS.de>
 - First build of GOsa 2.6 as an RPM, should work on SuSE and RedHat
+* Thu May 14 2010 
+- Corrected errors when building RPM and plugins where not on right
+  place Closes #957 and #970
diff --git a/gosa-core/redhat/rpm-make-gosa b/gosa-core/redhat/rpm-make-gosa
index 2fd225ed9..668216823 100755
--- a/gosa-core/redhat/rpm-make-gosa
+++ b/gosa-core/redhat/rpm-make-gosa
@@ -105,13 +105,13 @@ fi
 
 # Move localization
 mkdir -p %{buildroot}/usr/share/gosa/locale/plugins/@@NAME@@
-if ls ./local/* &> /dev/null ;then
+if ls ./locale/* &> /dev/null ;then
 	mv ./locale/* %{buildroot}/usr/share/gosa/locale/plugins/@@NAME@@
 fi
 
 # Move plugin itself
-mkdir -p %{buildroot}/usr/share/gosa/plugins/@@NAME@@
-mv ./* %{buildroot}/usr/share/gosa/plugins/@@NAME@@
+mkdir -p %{buildroot}/usr/share/gosa/plugins/
+mv ./* %{buildroot}/usr/share/gosa/plugins/
 
 %post
 /usr/sbin/update-gosa
@@ -124,7 +124,7 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
-%attr (-,root,root) /usr/share/gosa/plugins/@@NAME@@
+%attr (-,root,root) /usr/share/gosa/plugins/
 %attr (-,root,root) /usr/share/gosa/doc/plugins/@@NAME@@
 %attr (-,root,root) /usr/share/gosa/locale/plugins/@@NAME@@
 %attr (-,root,root) /usr/share/gosa/html/plugins/@@NAME@@
@@ -139,6 +139,7 @@ EOF
 mv $configfile ${2}/SPECS
 cp -r ./rpm_src/gosa-plugins/${1} /tmp/gosa-plugin-${1}-${version}
 cd /tmp/
+rm /tmp/gosa-plugin-${1}-${version}/plugin.dsc
 tar cjf ${2}/SOURCES/gosa-plugin-${1}-${version}.tar.bz2 ./gosa-plugin-${1}-${version}
 rm -rf gosa-plugin-${1}-${version}
 echo "Done."
-- 
2.30.2