Attachment 160083 Details for Bug 249777 – CVS Diffs

[patch] CVS Diffs

diffs.txt (text/plain), 9.06 KB, created by Nathan Kinder on 2007-07-26 22:52:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nathan Kinder

Created: 2007-07-26 22:52:06 UTC

Size: 9.06 KB

patch

obsolete

>Index: build.properties
>===================================================================
>RCS file: /cvs/dirsec/console/build.properties,v
>retrieving revision 1.11
>diff -u -5 -t -r1.11 build.properties
>--- build.properties	29 Jun 2007 20:32:26 -0000	1.11
>+++ build.properties	26 Jul 2007 22:40:58 -0000
>@@ -38,11 +38,11 @@
> 
> base.core=${console.brand}-base
> 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}
> 
> jss.jar.name=jss4.jar
> ldapjdk.jar.name=ldapjdk.jar
>Index: build.xml
>===================================================================
>RCS file: /cvs/dirsec/console/build.xml,v
>retrieving revision 1.14
>diff -u -5 -t -r1.14 build.xml
>--- build.xml	29 Jun 2007 20:32:26 -0000	1.14
>+++ build.xml	26 Jul 2007 22:40:58 -0000
>@@ -182,22 +182,23 @@
>              fork="true"
>              excludes="**/CVS/**">
>              <classpath refid="console.classpath" />
>     </javac>
> 
>-    
>-    <copy file="startconsole" todir="${release.dir}"/>
>-    <replace file="${release.dir}/startconsole">
>+    
>+    <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}"/>
>       <replacefilter token="@basejar@" value="${base.name}.jar"/>
>       <replacefilter token="@mccjar@" value="${mcc.name}.jar"/>
>       <replacefilter token="@mcclangjar@" value="${mcc.name}_${lang}.jar"/>
>       <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
>diff -u -5 -t -r1.2 fedora-console.spec
>--- fedora-console.spec	29 Jun 2007 20:32:26 -0000	1.2
>+++ fedora-console.spec	26 Jul 2007 22:40:58 -0000
>@@ -1,11 +1,11 @@
> %define major_version 1.1
> %define minor_version 0
> 
> Name: fedora-console
> Version: %{major_version}.%{minor_version}
>-Release: 1
>+Release: 2
> Group: Applications
> Vendor: Fedora Project
> URL: http://directory.fedora.redhat.com
> License: LGPL
> Packager: Red Hat, Inc. <http://bugzilla.redhat.com/bugzilla>
>@@ -44,58 +44,67 @@
> %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/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)
> /usr/share/java/fedora-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 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
> 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
>-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
> 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
>-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@redhat.com 1.1.0-1
>+* Thu Jul 26 2007 Nathan Kinder <nkinder@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@redhat.com> 1.1.0-1
> - Updated for 1.1.0 release
> 
> * Mon Nov 14 2005 Nathan Kinder <nkinder@redhat.com> 1.0-1
> - Initial creation
>Index: src/com/netscape/management/client/console/Console.java
>===================================================================
>RCS file: /cvs/dirsec/console/src/com/netscape/management/client/console/Console.java,v
>retrieving revision 1.10
>diff -u -5 -t -r1.10 Console.java
>--- src/com/netscape/management/client/console/Console.java	2 Jul 2007 18:49:24 -0000	1.10
>+++ src/com/netscape/management/client/console/Console.java	26 Jul 2007 22:40:58 -0000
>@@ -51,10 +51,19 @@
> public class Console implements CommClient {
>     // Capture the time before any class is loaded so that we can measure JVM load time
>     static long _t0 = System.currentTimeMillis();
> 
>     //
>+    // global values
>+    //
>+    public static Preferences _preferences;
>+    public static ConsoleInfo _info;
>+    public static String _consoleAdminURL;
>+    public static ResourceSet _resource = new ResourceSet("com.netscape.management.client.console.console");
>+    public static ResourceSet _resource_theme = new ResourceSet("com.netscape.management.client.theme.theme");
>+
>+    //
>     // preference information
>     //
>     public static final String IDENTIFIER = "Console";
>     public static final String VERSION = VersionInfo.getVersionNumber();
>     public static final String MAJOR_VERSION = VersionInfo.getMajorVersionNumber();
>@@ -68,26 +77,17 @@
>     public static final String PREFERENCE_LOCAL = "StorePrefsToDisk";
>     public static final String PREFERENCE_X = "X";
>     public static final String PREFERENCE_Y = "Y";
> 
>     public static final String PREFERENCE_DIR = System.getProperty("user.home") + File.separator +
>-                                                ".fedora-console" + File.separator;
>+                              _resource_theme.getString("console","prefsdir") + File.separator;
> 
>     public static final String OPTION_NOWINPOS = "nowinpos";
>     public static final String OPTION_NOLOGO = "nologo";
>     public static final String OPTION_JAVALAF = "javalaf";
> 
>-        public static final int MAX_RECENT_URLS = 5;
>-
>-    //
>-    // global values
>-    //
>-    public static Preferences _preferences;
>-    public static ConsoleInfo _info;
>-    public static String _consoleAdminURL;
>-    public static ResourceSet _resource = new ResourceSet("com.netscape.management.client.console.console");
>-    public static ResourceSet _resource_theme = new ResourceSet("com.netscape.management.client.theme.theme");
>+    public static final int MAX_RECENT_URLS = 5;
> 
>     //
>     // private values
>     //
>     private String _adminServerSIE;
>Index: src/com/netscape/management/client/theme/theme.properties
>===================================================================
>RCS file: /cvs/dirsec/console/src/com/netscape/management/client/theme/theme.properties,v
>retrieving revision 1.3
>diff -u -5 -t -r1.3 theme.properties
>--- src/com/netscape/management/client/theme/theme.properties	2 Jul 2007 18:49:25 -0000	1.3
>+++ src/com/netscape/management/client/theme/theme.properties	26 Jul 2007 22:40:58 -0000
>@@ -18,10 +18,11 @@
> # END COPYRIGHT BLOCK
> #
> 
> console-title=Fedora Management Console
> console-useragent=Fedora-Management-Console
>+console-prefsdir=.fedora-console
> login-title=Fedora Management Console Login
> banner-console=Fedora Management Console
> 
> defaultAbout-dialogTitle=Fedora Management Console
> defaultAbout-productLogo=com/netscape/management/client/theme/images/logo32.gif

Actions: View | Diff

Attachments on bug 249777: 160083 | 160084