[389-console/el5] had to move some stuff around to make jpackage_script happy - it's magic

[Richard Allen Megginson]

commit df42166d39d3ede786dbc7d4c96c5ddcf9e4bbb2
Author: Rich Megginson <rmeggins at redhat.com>
Date:   Fri Oct 7 16:52:34 2011 -0600

    had to move some stuff around to make jpackage_script happy - it's magic

 389-console.spec |   22 ++++++++++++++--------
 1 files changed, 14 insertions(+), 8 deletions(-)
---
diff --git a/389-console.spec b/389-console.spec
index f401f51..3851532 100644
--- a/389-console.spec
+++ b/389-console.spec
@@ -6,7 +6,7 @@
 
 Name: 389-console
 Version: %{major_version}.%{minor_version}
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: 389 Management Console
 
 Group: Applications/System
@@ -51,6 +51,13 @@ Administration Server and 389 Directory Server.
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_javadir}
 install -m644 built/*.jar $RPM_BUILD_ROOT%{_javadir}
+
+# create symlinks
+pushd $RPM_BUILD_ROOT%{_javadir}
+ln -s %{name}-%{version}_%{consolelang}.jar %{name}-%{major_version}_%{consolelang}.jar
+ln -s %{name}-%{version}_%{consolelang}.jar %{name}_%{consolelang}.jar
+popd
+
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/java
 cat > $RPM_BUILD_ROOT%{_sysconfdir}/java/%{name}.conf <<EOF
 for file in %{_sysconfdir}/java/*-%{name}.conf ; do
@@ -63,15 +70,11 @@ ADDITIONAL_JARS=\${ADDITIONAL_JARS:-%{name}_\$mylang.jar}
 ADDITIONAL_OPTIONS=\${ADDITIONAL_OPTIONS:-"-Djava.util.prefs.systemRoot=\$HOME/.%{name} -Djava.util.prefs.userRoot=\$HOME/.%{name}"}
 EOF
 chmod 644 $RPM_BUILD_ROOT%{_sysconfdir}/java/%{name}.conf
+
 %jpackage_script com.netscape.management.client.console.Console "" "" jss4.jar:ldapjdk.jar:idm-console-base.jar:idm-console-mcc.jar:idm-console-mcc_%{consolelang}.jar:idm-console-nmclf.jar:idm-console-nmclf_%{consolelang}.jar %{name} true
-# bug in %jpackage_script on el5 - does not chmod 0755 the script
-chmod 755 $RPM_BUILD_ROOT%{_bindir)/%{name}
 
-# create symlinks
-pushd $RPM_BUILD_ROOT%{_javadir}
-ln -s %{name}-%{version}_%{consolelang}.jar %{name}-%{major_version}_%{consolelang}.jar
-ln -s %{name}-%{version}_%{consolelang}.jar %{name}_%{consolelang}.jar
-popd
+# bug in jpackage_script macro on el5 - does not chmod 0755 the script
+chmod 0755 $RPM_BUILD_ROOT%{_bindir}/%{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -86,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/java/%{name}.conf
 
 %changelog
+* Fri Oct  7 2011 Rich Megginson <rmeggins at redhat.com> - 1.1.7-3
+- had to move some stuff around to make jpackage_script happy - it's magic
+
 * Fri Oct  7 2011 Rich Megginson <rmeggins at redhat.com> - 1.1.7-2
 - script was not being created as executable