[Fedora-directory-commits] console idm-console-framework.spec, NONE, 1.1 build.properties, 1.13, 1.14 build.xml, 1.16, 1.17 fedora-idm-console, 1.1, NONE fedora-idm-console.spec, 1.2, NONE
Nathan Kinder (nkinder)
fedora-directory-commits at redhat.com
Wed Aug 1 21:29:57 UTC 2007
Author: nkinder
Update of /cvs/dirsec/console
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16097
Modified Files:
build.properties build.xml
Added Files:
idm-console-framework.spec
Removed Files:
fedora-idm-console fedora-idm-console.spec
Log Message:
Resolves: 250481
Summary: Make console framework brand agnostic. Remove theme.
--- NEW FILE idm-console-framework.spec ---
%define major_version 1.1
%define minor_version 0
Name: idm-console-framework
Version: %{major_version}.%{minor_version}
Release: 1
Summary: Identity Management Console Framework
Group: System Environment/Libraries
License: LGPL
URL: http://directory.fedoraproject.org
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
Source: %{name}-%{version}.tar.bz2
Requires: ldapjdk
Requires: jss >= 4.2
BuildRequires: ant >= 1.6.2
BuildRequires: ldapjdk
BuildRequires: jss >= 4.2
%description
A Java Management Console framework used for remote server management.
%prep
%setup -q
%build
%{ant} \
-Dlib.dir=%{_libdir} \
-Dbuilt.dir=`pwd`/built \
-Dclassdest=%{_javadir}
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_javadir}
install -m777 built/release/jars/idm-console-* $RPM_BUILD_ROOT%{_javadir}
# create symlinks
pushd $RPM_BUILD_ROOT%{_javadir}
ln -s idm-console-base-%{version}.jar idm-console-base-%{major_version}.jar
ln -s idm-console-base-%{version}.jar idm-console-base.jar
ln -s idm-console-mcc-%{version}.jar idm-console-mcc-%{major_version}.jar
ln -s idm-console-mcc-%{version}.jar idm-console-mcc.jar
ln -s idm-console-mcc-%{version}_en.jar idm-console-mcc-%{major_version}_en.jar
ln -s idm-console-mcc-%{version}_en.jar idm-console-mcc_en.jar
ln -s idm-console-nmclf-%{version}.jar idm-console-nmclf-%{major_version}.jar
ln -s idm-console-nmclf-%{version}.jar idm-console-nmclf.jar
ln -s idm-console-nmclf-%{version}_en.jar idm-console-nmclf-%{major_version}_en.jar
ln -s idm-console-nmclf-%{version}_en.jar idm-console-nmclf_en.jar
popd
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
%{_javadir}/idm-console-base-%{version}.jar
%{_javadir}/idm-console-base-%{major_version}.jar
%{_javadir}/idm-console-base.jar
%{_javadir}/idm-console-mcc-%{version}.jar
%{_javadir}/idm-console-mcc-%{major_version}.jar
%{_javadir}/idm-console-mcc.jar
%{_javadir}/idm-console-mcc-%{version}_en.jar
%{_javadir}/idm-console-mcc-%{major_version}_en.jar
%{_javadir}/idm-console-mcc_en.jar
%{_javadir}/idm-console-nmclf-%{version}.jar
%{_javadir}/idm-console-nmclf-%{major_version}.jar
%{_javadir}/idm-console-nmclf.jar
%{_javadir}/idm-console-nmclf-%{version}_en.jar
%{_javadir}/idm-console-nmclf-%{major_version}_en.jar
%{_javadir}/idm-console-nmclf_en.jar
%changelog
* Wed Aug 1 2007 Nathan Kinder <nkinder at redhat.com> 1.1.0-1
- Initial creation (based on old fedora-idm-console package).
Index: build.properties
===================================================================
RCS file: /cvs/dirsec/console/build.properties,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- build.properties 27 Jul 2007 20:29:59 -0000 1.13
+++ build.properties 1 Aug 2007 21:29:55 -0000 1.14
@@ -21,28 +21,22 @@
lang=en
-console.brand=fedora
-
console.root=.
console.version=11
console.dotversion=1.1.0
console.dotgenversion=1.1
-mcc.core=${console.brand}-mcc
+mcc.core=idm-console-mcc
mcc.name=${mcc.core}-${console.dotversion}
mcc.gen.name=${mcc.core}-${console.dotgenversion}
-nmclf.core=${console.brand}-nmclf
+nmclf.core=idm-console-nmclf
nmclf.name=${nmclf.core}-${console.dotversion}
nmclf.gen.name=${nmclf.core}-${console.dotgenversion}
-base.core=${console.brand}-idm-console-base
+base.core=idm-console-base
base.name=${base.core}-${console.dotversion}
base.gen.name=${base.core}-${console.dotgenversion}
-theme.core=${console.brand}-idm-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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- build.xml 27 Jul 2007 20:29:59 -0000 1.16
+++ build.xml 1 Aug 2007 21:29:55 -0000 1.17
@@ -183,22 +183,6 @@
excludes="**/CVS/**">
<classpath refid="console.classpath" />
</javac>
-
- <!-- 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}"/>
- <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>
<!-- Package -->
@@ -232,12 +216,6 @@
<include name="com/netscape/management/client/**/*.properties" />
<include name="com/netscape/management/client/**/*.gif" />
<include name="com/netscape/management/client/**/*.jpg" />
- <exclude name="com/netscape/management/client/theme/**" />
- </fileset>
- </jar>
- <jar jarfile="${built.jardir}/${theme.name}_${lang}.jar" >
- <fileset dir="${java.src.dir}">
- <include name="com/netscape/management/client/theme/**" />
</fileset>
</jar>
<jar jarfile="${built.jardir}/${nmclf.name}.jar" >
@@ -280,7 +258,6 @@
<!-- Copy built jars to packaging area -->
<copy file="${built.jardir}/${mcc.name}.jar" todir="${java.dir}"/>
<copy file="${built.jardir}/${mcc.name}_${lang}.jar" todir="${java.dir}"/>
- <copy file="${built.jardir}/${theme.name}_${lang}.jar" todir="${java.dir}"/>
<copy file="${built.jardir}/${nmclf.name}.jar" todir="${java.dir}"/>
<copy file="${built.jardir}/${nmclf.name}_${lang}.jar" todir="${java.dir}"/>
<copy file="${built.jardir}/${base.name}.jar" todir="${java.dir}"/>
@@ -292,9 +269,6 @@
<arg line="-s ${mcc.name}_${lang}.jar ${mcc.gen.name}_${lang}.jar"/>
</exec>
<exec executable="ln" dir="${java.dir}" vmlauncher="true">
- <arg line="-s ${theme.name}_${lang}.jar ${theme.gen.name}_${lang}.jar"/>
- </exec>
- <exec executable="ln" dir="${java.dir}" vmlauncher="true">
<arg line="-s ${nmclf.name}.jar ${nmclf.gen.name}.jar"/>
</exec>
<exec executable="ln" dir="${java.dir}" vmlauncher="true">
--- fedora-idm-console DELETED ---
--- fedora-idm-console.spec DELETED ---
More information about the Fedora-directory-commits
mailing list