[389-console/f13] use jpackage_script instead of packaging our own shell script
Richard Allen Megginson
rmeggins at fedoraproject.org
Wed Jun 15 21:45:12 UTC 2011
commit c4d5656f39bcdafd7821a83063b3283f26f51c32
Author: Rich Megginson <rmeggins at redhat.com>
Date: Wed Jun 15 14:49:25 2011 -0600
use jpackage_script instead of packaging our own shell script
use jpackage_script instead of packaging our own shell script
support "skins" package for other brands/versions
.gitignore | 1 +
389-console.spec | 52 +++++++++++++++++++++++++++++++++++++---------------
sources | 2 +-
3 files changed, 39 insertions(+), 16 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1c35865..757c625 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
389-console-1.1.4.tar.bz2
+/389-console-1.1.7.tar.bz2
diff --git a/389-console.spec b/389-console.spec
index 503377c..402dc0e 100644
--- a/389-console.spec
+++ b/389-console.spec
@@ -1,5 +1,8 @@
%define major_version 1.1
-%define minor_version 4
+%define minor_version 7
+
+# only have localization for en right now
+%global consolelang en
Name: 389-console
Version: %{major_version}.%{minor_version}
@@ -15,17 +18,16 @@ BuildArch: noarch
Source: http://port389.org/sources/%{name}-%{version}.tar.bz2
Requires: idm-console-framework
Requires: java >= 1:1.6.0
-Requires: which
+Requires: jpackage-utils
BuildRequires: ant
BuildRequires: ldapjdk
BuildRequires: jss
BuildRequires: idm-console-framework
BuildRequires: java-devel >= 1:1.6.0
-Provides: fedora-idm-console = %{version}-%{release}
-Obsoletes: fedora-idm-console < 1.1.3-2
-%if 0%{?rhel} < 6
-ExcludeArch: ppc
-%endif
+BuildRequires: jpackage-utils
+%if 0%{?rhel} < 6
+ExcludeArch: ppc
+%endif
%description
A Java based remote management console used for managing 389
@@ -36,7 +38,8 @@ Administration Server and 389 Directory Server.
%build
%{ant} \
- -Dbuilt.dir=`pwd`/built
+ -Dbuilt.dir=`pwd`/built \
+ buildnoscript
# add -Dlib.dir and -Dneed_libdir on those platforms where
# jss is installed in a non-standard location
@@ -46,13 +49,24 @@ 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}
-install -d $RPM_BUILD_ROOT%{_bindir}
-install -m755 built/%{name} $RPM_BUILD_ROOT/%{_bindir}
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/java
+cat > $RPM_BUILD_ROOT%{_sysconfdir}/java/%{name}.conf <<EOF
+for file in %{_sysconfdir}/java/*-%{name}.conf ; do
+ if [ -f "\$file" ] ; then
+ . "\$file"
+ fi
+done
+mylang=\${mylang:-%{consolelang}}
+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
# create symlinks
pushd $RPM_BUILD_ROOT%{_javadir}
-ln -s %{name}-%{version}_en.jar %{name}-%{major_version}_en.jar
-ln -s %{name}-%{version}_en.jar %{name}_en.jar
+ln -s %{name}-%{version}_%{consolelang}.jar %{name}-%{major_version}_%{consolelang}.jar
+ln -s %{name}-%{version}_%{consolelang}.jar %{name}_%{consolelang}.jar
popd
%clean
@@ -61,12 +75,20 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%doc LICENSE
-%{_javadir}/%{name}-%{version}_en.jar
-%{_javadir}/%{name}-%{major_version}_en.jar
-%{_javadir}/%{name}_en.jar
+%{_javadir}/%{name}-%{version}_%{consolelang}.jar
+%{_javadir}/%{name}-%{major_version}_%{consolelang}.jar
+%{_javadir}/%{name}_%{consolelang}.jar
%{_bindir}/%{name}
+%{_sysconfdir}/java/%{name}.conf
%changelog
+* Tue Jun 14 2011 Rich Megginson <rmeggins at redhat.com> - 1.1.7-1
+- use jpackage_script instead of packaging our own shell script
+- support "skins" package for other brands/versions
+
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
* Thu Apr 15 2010 Rich Megginson <rmeggins at redhat.com> - 1.1.4-1
- 1.1.4 release
diff --git a/sources b/sources
index 807cb3b..49c37fc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-eaa1b54b2fcc527c37a25e3b5d194fb4 389-console-1.1.4.tar.bz2
+e2c92a908c633fffe79de8add27906c6 389-console-1.1.7.tar.bz2
More information about the scm-commits
mailing list