[Fedora-directory-commits] console fedora-idm-console, NONE, 1.1 fedora-idm-console.spec, NONE, 1.1 build.properties, 1.12, 1.13 build.xml, 1.15, 1.16 fedora-console, 1.1, NONE fedora-console.spec, 1.3, NONE

[Doctor Conrad]

Author: nkinder

Update of /cvs/dirsec/console
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5556

Modified Files:
    build.properties build.xml 
Added Files:
    fedora-idm-console fedora-idm-console.spec 
Removed Files:
    fedora-console fedora-console.spec 
Log Message:
Resolves: 249897
Summary: Changed package name to fedora-idm-console.

--- NEW FILE fedora-idm-console ---
#!/bin/sh
#
# BEGIN COPYRIGHT BLOCK
# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
# License as published by the Free Software Foundation version
# 2.1 of the License.
#                                                                                 
# This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
# Lesser General Public License for more details.
#                                                                                 
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
# END COPYRIGHT BLOCK

JAVA=`which java`
if [ -z "$JAVA" -o ! -x "$JAVA" ]
then
  echo "$0: The java program is not in your path, or is not executable.";
  exit 1
fi

CLASSDEST=@classdest@

#
# Launch the Console
#
java -ms8m -mx64m -cp @jssjar@:@ldapjdkjar@:$CLASSDEST/@basejar@:$CLASSDEST/@mccjar@:$CLASSDEST/@mcclangjar@:$CLASSDEST/@nmclfjar@:$CLASSDEST/@nmclflangjar@:$CLASSDEST/@themejar@ -Djava.library.path=@libdir@ -Djava.util.prefs.systemRoot="$HOME/.@prefsdir@" -Djava.util.prefs.userRoot="$HOME/.@prefsdir@" com.netscape.management.client.console.Console $*

--- NEW FILE fedora-idm-console.spec ---
%define major_version 1.1
%define minor_version 0

Name: fedora-idm-console
Version: %{major_version}.%{minor_version}
Release: 3
Group: Applications
Vendor: Fedora Project
URL: http://directory.fedora.redhat.com
License: LGPL
Packager: Red Hat, Inc. http://bugzilla.redhat.com/bugzilla
Summary: Fedora Management Console
BuildRoot: %{_tmppath}/%{name}-%{version}-root
BuildArch: noarch
Source: %{name}-%{version}.tar.gz
Autoreq: 0
AutoReqProv: no
Requires: %{name}-framework >= %{version}
BuildPreReq: ant >= 1.6.2, ldapjdk >= 4.18, jss >=  4.2

%description
A Java based remote management console used for Managing Fedora
Administration Server and Fedora Directory Server.

# prep and setup expect there to be a Source file
# in the /usr/src/redhat/SOURCES directory - it will be unpacked
# in the _builddir (not BuildRoot)

%package framework
Summary: Fedora Management Console Framework
Requires: ldapjdk >= 4.18, jss >= 4.2
Group: System Environment/Libraries

%description framework
A Java Management Console framework used for remote server management.

%prep
%setup -q

%build
cd console
ant -Dlib.dir=%{_libdir}

%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT/usr/share/java
install -m777 built/release/jars/fedora-* $RPM_BUILD_ROOT/usr/share/java
install -d $RPM_BUILD_ROOT/usr/bin
install -m777 built/release/%{name} $RPM_BUILD_ROOT/usr/bin

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
/usr/share/java/%{name}-%{version}_en.jar
/usr/bin/%{name}

%files framework
%defattr(-,root,root)
/usr/share/java/%{name}-base-%{version}.jar
/usr/share/java/fedora-mcc-%{version}.jar
/usr/share/java/fedora-mcc-%{version}_en.jar
/usr/share/java/fedora-nmclf-%{version}.jar
/usr/share/java/fedora-nmclf-%{version}_en.jar

%post
cd /usr/share/java
ln -s %{name}-%{version}_en.jar %{name}-%{major_version}_en.jar
ln -s %{name}-%{version}_en.jar %{name}_en.jar

%post framework
cd /usr/share/java
ln -s %{name}-base-%{version}.jar %{name}-base-%{major_version}.jar
ln -s %{name}-base-%{version}.jar %{name}-base.jar
ln -s fedora-mcc-%{version}.jar fedora-mcc-%{major_version}.jar
ln -s fedora-mcc-%{version}.jar fedora-mcc.jar
ln -s fedora-mcc-%{version}_en.jar fedora-mcc-%{major_version}_en.jar
ln -s fedora-mcc-%{version}_en.jar fedora-mcc_en.jar
ln -s fedora-nmclf-%{version}.jar fedora-nmclf-%{major_version}.jar
ln -s fedora-nmclf-%{version}.jar fedora-nmclf.jar
ln -s fedora-nmclf-%{version}_en.jar fedora-nmclf-%{major_version}_en.jar
ln -s fedora-nmclf-%{version}_en.jar fedora-nmclf_en.jar

%preun
rm -rf /usr/share/java/%{name}-%{major_version}_en.jar
rm -rf /usr/share/java/%{name}_en.jar

%preun framework
rm -rf /usr/share/java/%{name}-base-%{major_version}.jar
rm -rf /usr/share/java/%{name}-base.jar
rm -rf /usr/share/java/fedora-mcc-%{major_version}.jar
rm -rf /usr/share/java/fedora-mcc.jar
rm -rf /usr/share/java/fedora-mcc-%{major_version}_en.jar
rm -rf /usr/share/java/fedora-mcc_en.jar
rm -rf /usr/share/java/fedora-nmclf-%{major_version}.jar
rm -rf /usr/share/java/fedora-nmclf.jar
rm -rf /usr/share/java/fedora-nmclf-%{major_version}_en.jar
rm -rf /usr/share/java/fedora-nmclf_en.jar

%changelog
* Fri Jul 27 2007 Nathan Kinder  1.1.0-3
- Changed package name to be less generic.

* Thu Jul 26 2007 Nathan Kinder  1.1.0-2
- Updated start script and theme jar names. Fixed post and
  preun steps for framework subpackage.

* Fri Jun 29 2007 Nathan Kinder  1.1.0-1
- Updated for 1.1.0 release

* Mon Nov 14 2005 Nathan Kinder  1.0-1
- Initial creation

Index: build.properties
===================================================================
RCS file: /cvs/dirsec/console/build.properties,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- build.properties	26 Jul 2007 23:08:46 -0000	1.12
+++ build.properties	27 Jul 2007 20:29:59 -0000	1.13
@@ -36,11 +36,11 @@
 nmclf.name=${nmclf.core}-${console.dotversion}
 nmclf.gen.name=${nmclf.core}-${console.dotgenversion}

-base.core=${console.brand}-base
+base.core=${console.brand}-idm-console-base
 base.name=${base.core}-${console.dotversion}
 base.gen.name=${base.core}-${console.dotgenversion}

-theme.core=${console.brand}-console
+theme.core=${console.brand}-idm-console
 theme.name=${theme.core}-${console.dotversion}
 theme.gen.name=${theme.core}-${console.dotgenversion}

Index: build.xml
===================================================================
RCS file: /cvs/dirsec/console/build.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- build.xml	26 Jul 2007 23:08:46 -0000	1.15
+++ build.xml	27 Jul 2007 20:29:59 -0000	1.16
@@ -184,9 +184,9 @@
              <classpath refid="console.classpath" />
     </javac>

-    <!-- create fedora-console script -->
-    <copy file="fedora-console" todir="${release.dir}"/>
-    <replace file="${release.dir}/fedora-console">
+    <!-- create fedora-idm-console script -->
+    <copy file="fedora-idm-console" todir="${release.dir}"/>
+    <replace file="${release.dir}/fedora-idm-console">
       <replacefilter token="@classdest@" value="${classdest}"/>
       <replacefilter token="@jssjar@" value="${jss.local.location}/${jss.jar.name}"/> 
       <replacefilter token="@ldapjdkjar@" value="${ldapjdk.local.location}/${ldapjdk.jar.name}"/>

--- fedora-console DELETED ---

--- fedora-console.spec DELETED ---