[Fedora-directory-commits] console fedora-console, NONE, 1.1 build.properties, 1.11, 1.12 build.xml, 1.14, 1.15 fedora-console.spec, 1.2, 1.3 startconsole, 1.7, NONE
Nathan Kinder (nkinder)
fedora-directory-commits at redhat.com
Thu Jul 26 23:08:50 UTC 2007
Author: nkinder
Update of /cvs/dirsec/console
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27292
Modified Files:
build.properties build.xml fedora-console.spec
Added Files:
fedora-console
Removed Files:
startconsole
Log Message:
Resolves: 249777
Summary: Moved preference dir name into theme. Did some cleanup to the specfile around post and preun steps. Renamed start script.
--- NEW FILE fedora-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/. at prefsdir@" -Djava.util.prefs.userRoot="$HOME/. at prefsdir@" com.netscape.management.client.console.Console $*
Index: build.properties
===================================================================
RCS file: /cvs/dirsec/console/build.properties,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- build.properties 29 Jun 2007 20:32:26 -0000 1.11
+++ build.properties 26 Jul 2007 23:08:46 -0000 1.12
@@ -40,7 +40,7 @@
base.name=${base.core}-${console.dotversion}
base.gen.name=${base.core}-${console.dotgenversion}
-theme.core=${console.brand}-theme
+theme.core=${console.brand}-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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- build.xml 29 Jun 2007 20:32:26 -0000 1.14
+++ build.xml 26 Jul 2007 23:08:46 -0000 1.15
@@ -184,9 +184,9 @@
<classpath refid="console.classpath" />
</javac>
- <!-- create startconsole script -->
- <copy file="startconsole" todir="${release.dir}"/>
- <replace file="${release.dir}/startconsole">
+ <!-- create fedora-console script -->
+ <copy file="fedora-console" todir="${release.dir}"/>
+ <replace file="${release.dir}/fedora-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}"/>
@@ -196,6 +196,7 @@
<replacefilter token="@nmclfjar@" value="${nmclf.name}.jar"/>
<replacefilter token="@nmclflangjar@" value="${nmclf.name}_${lang}.jar"/>
<replacefilter token="@themejar@" value="${theme.name}_${lang}.jar"/>
+ <replacefilter token="@prefsdir@" value="${theme.core}"/>
<replacefilter token="@libdir@" value="${lib.dir}"/>
</replace>
</target>
Index: fedora-console.spec
===================================================================
RCS file: /cvs/dirsec/console/fedora-console.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fedora-console.spec 29 Jun 2007 20:32:26 -0000 1.2
+++ fedora-console.spec 26 Jul 2007 23:08:46 -0000 1.3
@@ -3,7 +3,7 @@
Name: fedora-console
Version: %{major_version}.%{minor_version}
-Release: 1
+Release: 2
Group: Applications
Vendor: Fedora Project
URL: http://directory.fedora.redhat.com
@@ -46,15 +46,15 @@
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/startconsole $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/fedora-theme-%{version}_en.jar
-/usr/bin/startconsole
+/usr/share/java/%{name}-%{version}_en.jar
+/usr/bin/%{name}
%files framework
%defattr(-,root,root)
@@ -63,9 +63,14 @@
/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 fedora-base-%{version}.jar fedora-base-%{major_version}.jar
ln -s fedora-base-%{version}.jar fedora-base.jar
ln -s fedora-mcc-%{version}.jar fedora-mcc-%{major_version}.jar
@@ -76,10 +81,12 @@
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
-ln -s fedora-theme-%{version}_en.jar fedora-theme-%{major_version}_en.jar
-ln -s fedora-theme-%{version}_en.jar fedora-theme_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/fedora-base-%{major_version}.jar
rm -rf /usr/share/java/fedora-base.jar
rm -rf /usr/share/java/fedora-mcc-%{major_version}.jar
@@ -90,11 +97,13 @@
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
-rm -rf /usr/share/java/fedora-theme-%{major_version}_en.jar
-rm -rf /usr/share/java/fedora-theme_en.jar
%changelog
-* Fri Jun 29 2007 Nathan Kinder <nkinder at redhat.com 1.1.0-1
+* Thu Jul 26 2007 Nathan Kinder <nkinder at redhat.com> 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 <nkinder at redhat.com> 1.1.0-1
- Updated for 1.1.0 release
* Mon Nov 14 2005 Nathan Kinder <nkinder at redhat.com> 1.0-1
--- startconsole DELETED ---
More information about the Fedora-directory-commits
mailing list