[389-console/epel7] 1.1.9 release

[Noriko Hosoi]

commit ce264d649fee1ade0a097845a5b8816243eca467
Author: Noriko Hosoi <nhosoi at redhat.com>
Date:   Mon Mar 9 13:19:19 2015 -0700

    1.1.9 release
    
    - Ticket 47604 - 389-console: remove versioned jars from %{_javadir}
    - Ticket 97    - 389-console should provide man page
    - Fixed symlink creation

 .gitignore       |  1 +
 389-console.spec | 24 ++++++++++++++++++++----
 sources          |  2 +-
 3 files changed, 22 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d320145..20821a6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 389-console-1.1.4.tar.bz2
 /389-console-1.1.7.tar.bz2
 /389-console-1.1.8.tar.bz2
+/389-console-1.1.9.tar.bz2
diff --git a/389-console.spec b/389-console.spec
index 4c398e3..793d750 100644
--- a/389-console.spec
+++ b/389-console.spec
@@ -1,5 +1,5 @@
 %define major_version 1.1
-%define minor_version 8
+%define minor_version 9
 
 # only have localization for en right now
 %global consolelang en
@@ -24,7 +24,6 @@ BuildRequires: ldapjdk
 BuildRequires: jss
 BuildRequires: idm-console-framework
 BuildRequires: java-devel >= 1:1.6.0
-BuildRequires: jpackage-utils
 %if 0%{?rhel} < 6
 ExcludeArch: ppc
 %endif
@@ -38,7 +37,7 @@ Administration Server and 389 Directory Server.
                                                                                 
 %build
 %{ant} \
-    -Dbuilt.dir=`pwd`/built \
+    -Dbuilt.dir=`pwd`/built -Dman.dir=`pwd`/built%{_mandir} \
     buildnoscript
 
 # add -Dlib.dir and -Dneed_libdir on those platforms where
@@ -62,6 +61,14 @@ ADDITIONAL_OPTIONS=\${ADDITIONAL_OPTIONS:-"-Djava.util.prefs.systemRoot=\$HOME/.
 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
+install -d $RPM_BUILD_ROOT%{_mandir}/man8
+install -m644 built%{_mandir}/man8/* $RPM_BUILD_ROOT%{_mandir}/man8
+
+# create symlinks
+pushd $RPM_BUILD_ROOT%{_javadir}
+ln -s %{name}_%{consolelang}.jar %{name}-%{version}_%{consolelang}.jar 
+ln -s %{name}-%{version}_%{consolelang}.jar %{name}-%{major_version}_%{consolelang}.jar
+popd
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -69,11 +76,20 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc LICENSE
+%{_javadir}/%{name}-%{version}_%{consolelang}.jar
+%{_javadir}/%{name}-%{major_version}_%{consolelang}.jar
 %{_javadir}/%{name}_%{consolelang}.jar
 %{_bindir}/%{name}
 %{_sysconfdir}/java/%{name}.conf
+%{_mandir}/man8/*
 
 %changelog
+* Mon Mar  9 2015 Noriko Hosoi <nhosoi at redhat.com> - 1.1.9-1
+- 1.1.9 release
+- Ticket 47604 - 389-console: remove versioned jars from %{_javadir}
+- Ticket 97    - 389-console should provide man page
+- Fixed symlink creation
+
 * Mon Nov 10 2014 Mark Reynolds <mreynolds at redhat.com> - 1.1.8-1
 - Bump version to 1.1.8-1
 
@@ -146,5 +162,5 @@ rm -rf $RPM_BUILD_ROOT
 * Fri Jul 27 2007 Nathan Kinder <nkinder at redhat.com> 1.1.0-2
 - Modified package name to be less generic.
 
-* Mon Jul 23 2007 Nathan Kinder <nkinder at redhat.com> 1.1.0-1
+* Thu Jul 26 2007 Nathan Kinder <nkinder at redhat.com> 1.1.0-1
 - Initial creation
diff --git a/sources b/sources
index 87e5ce7..ea72915 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f8af6f63fd6dabffa4f87d902018c0f3  389-console-1.1.8.tar.bz2
+7a838c23faf6299b3e7d0abdd1186ec2  389-console-1.1.9.tar.bz2