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

.cvsignore

@@ -1 +0,0 @@
-389-console-1.1.3.tar.bz2

.gitignore

@@ -0,0 +1,2 @@
+389-console-1.1.4.tar.bz2
+/389-console-1.1.7.tar.bz2

389-console.spec

@@ -1,9 +1,12 @@
 %define major_version 1.1
-%define minor_version 3
+%define minor_version 7
+
+# only have localization for en right now
+%global consolelang en
 
 Name: 389-console
 Version: %{major_version}.%{minor_version}
-Release: 6%{?dist}
+Release: 1%{?dist}
 Summary: 389 Management Console
 
 Group: Applications/System
@@ -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,23 @@ 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@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@lists.fedoraproject.org> - 1.1.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Thu Apr 15 2010 Rich Megginson <rmeggins@redhat.com> - 1.1.4-1
+- 1.1.4 release
+
 * Fri Dec 18 2009 Rich Megginson <rmeggins@redhat.com> - 1.1.3-6
 - Excluding PPC for EPEL builds as there is not openjdk there
 

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: 389-console
-# $Id: Makefile,v 1.1 2009/06/18 20:28:34 tibbs Exp $
-NAME := 389-console
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

import.log

@@ -1 +0,0 @@
-89-console-1_1_3-2:HEAD:389-console-1.1.3-2.src.rpm:1245357596

sources

@@ -1 +1 @@
-65cc927851ae61d0763ea61fd92f18f9  389-console-1.1.3.tar.bz2
+e2c92a908c633fffe79de8add27906c6  389-console-1.1.7.tar.bz2