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 3b87207..4d46359 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: 5%{?dist} +Release: 1%{?dist} Summary: 389 Management Console Group: Applications/System @@ -15,7 +15,7 @@ URL: http://port389.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Source: http://port389.org/sources/%{name}-%{version}.tar.bz2 +Source: http://port389.org/binaries/%{name}-%{version}.tar.bz2 Requires: idm-console-framework Requires: java >= 1:1.6.0 Requires: jpackage-utils @@ -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,11 +61,13 @@ 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 -ln -s %{name}-%{version}_%{consolelang}.jar %{name}_%{consolelang}.jar popd %clean @@ -80,8 +81,15 @@ rm -rf $RPM_BUILD_ROOT %{_javadir}/%{name}_%{consolelang}.jar %{_bindir}/%{name} %{_sysconfdir}/java/%{name}.conf +%{_mandir}/man8/* %changelog +* Thu Feb 5 2015 Noriko Hosoi - 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 + * Fri Aug 02 2013 Fedora Release Engineering - 1.1.7-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild @@ -142,5 +150,5 @@ rm -rf $RPM_BUILD_ROOT * Fri Jul 27 2007 Nathan Kinder 1.1.0-2 - Modified package name to be less generic. -* Mon Jul 26 2007 Nathan Kinder 1.1.0-1 +* Thu Jul 26 2007 Nathan Kinder 1.1.0-1 - Initial creation 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