[389-console/f21] 1.1.9 release

Noriko Hosoi nhosoi at fedoraproject.org
Thu Feb 5 19:17:25 UTC 2015


commit e291308ac02238df132e6b12c2bf3a9f94ec915b
Author: Noriko Hosoi <nhosoi at redhat.com>
Date:   Thu Feb 5 11:10:43 2015 -0800

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

 .gitignore       |    2 ++
 389-console.spec |   18 ++++++++++++++----
 sources          |    2 +-
 3 files changed, 17 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 757c625..20821a6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +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 23b616b..5989ecc 100644
--- a/389-console.spec
+++ b/389-console.spec
@@ -1,12 +1,12 @@
 %define major_version 1.1
-%define minor_version 7
+%define minor_version 9
 
 # only have localization for en right now
 %global consolelang en
 
 Name: 389-console
 Version: %{major_version}.%{minor_version}
-Release: 8%{?dist}
+Release: 1%{?dist}
 Summary: 389 Management Console
 
 Group: Applications/System
@@ -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,8 @@ 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
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -72,8 +73,17 @@ rm -rf $RPM_BUILD_ROOT
 %{_javadir}/%{name}_%{consolelang}.jar
 %{_bindir}/%{name}
 %{_sysconfdir}/java/%{name}.conf
+%{_mandir}/man8/*
 
 %changelog
+* Thu Feb  5 2015 Noriko Hosoi <nhosoi at redhat.com> - 1.1.9-2
+- 1.1.9 release
+
+* Thu Feb  5 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
+
 * Fri Aug 29 2014 Mark Reynolds <mreynolds at redhat.com> - 1.1.7-8
 - Bug 1022104 -  remove versioned jars from %{_javadir}
 
diff --git a/sources b/sources
index 49c37fc..ea72915 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e2c92a908c633fffe79de8add27906c6  389-console-1.1.7.tar.bz2
+7a838c23faf6299b3e7d0abdd1186ec2  389-console-1.1.9.tar.bz2


More information about the scm-commits mailing list