Author: nkinder
Update of /cvs/dirsec/admservconsole
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6902
Modified Files:
build.properties build.xml
Added Files:
fedora-admserv-console.spec
Log Message:
Resolves: 247525
Summary: Fixed parameters passed to ReadLog CGI. Also some packaging/build changes for
building RPMs as well as a version bump.
--- NEW FILE fedora-admserv-console.spec ---
%define major_version 1.1
%define minor_version 0
Name: fedora-admserv-console
Version: %{major_version}.%{minor_version}
Release: 1
Group: Applications
Vendor: Fedora Project
URL:
http://directory.fedora.redhat.com
License: LGPL
Packager: Red Hat, Inc. <
http://bugzilla.redhat.com/bugzilla>
Summary: Fedora Directory Server Management Console
BuildRoot: %{_tmppath}/%{name}-%{version}-root
BuildArch: noarch
Source: %{name}-%{version}.tar.gz
Autoreq: 0
AutoReqProv: no
BuildPreReq: ant >= 1.6.2, ldapjdk >= 4.18, fedora-console-framework >= 1.1
%description
A Java based remote management console used for Managing Fedora
Administration 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)
%prep
%setup -q
%build
cd admservconsole
ant -Dconsole.location=/usr/share/java
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT/usr/share/java
install -m777 built/package/fedora-admserv* $RPM_BUILD_ROOT/usr/share/java
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
/usr/share/java/fedora-admserv-%{version}.jar
/usr/share/java/fedora-admserv-%{version}_en.jar
%post
cd /usr/share/java
ln -s fedora-admserv-%{version}.jar fedora-admserv-%{major_version}.jar
ln -s fedora-admserv-%{version}.jar fedora-admserv.jar
ln -s fedora-admserv-%{version}_en.jar fedora-admserv-%{major_version}_en.jar
ln -s fedora-admserv-%{version}_en.jar fedora-admserv_en.jar
%preun
rm -rf /usr/share/java/fedora-admserv-%{major_version}.jar
rm -rf /usr/share/java/fedora-admserv.jar
rm -rf /usr/share/java/fedora-admserv-%{major_version}_en.jar
rm -rf /usr/share/java/fedora-admserv_en.jar
%changelog
* Tue Jul 03 2007 Nathan Kinder <nkinder(a)redhat.com> 1.1.0-1
- Initial creation
Index: build.properties
===================================================================
RCS file: /cvs/dirsec/admservconsole/build.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build.properties 29 Sep 2006 17:17:27 -0000 1.3
+++ build.properties 9 Jul 2007 20:10:09 -0000 1.4
@@ -21,8 +21,8 @@
lang=en
admservconsole.root=..
-admservconsole.version=1.0.3
-admservconsole.gen.version=1.0
+admservconsole.version=1.1.0
+admservconsole.gen.version=1.1
brand=fedora
admservconsole.name=${brand}-admserv-${admservconsole.version}
admservconsole.gen.name=${brand}-admserv-${admservconsole.gen.version}
Index: build.xml
===================================================================
RCS file: /cvs/dirsec/admservconsole/build.xml,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- build.xml 22 May 2006 18:14:31 -0000 1.1.1.1
+++ build.xml 9 Jul 2007 20:10:09 -0000 1.2
@@ -82,10 +82,10 @@
<!-- Construct classpath -->
<path id="admservconsole.classpath">
<fileset dir="${console.location}">
- <include name="**/java/${brand}-base-*.jar"/>
- <include name="**/java/${brand}-mcc-*.jar"/>
- <include name="**/java/${brand}-nmclf-*.jar"/>
- <include name="**/java/ldapjdk.jar"/>
+ <include name="**/${brand}-base-*.jar"/>
+ <include name="**/${brand}-mcc-*.jar"/>
+ <include name="**/${brand}-nmclf-*.jar"/>
+ <include name="**/ldapjdk.jar"/>
</fileset>
<pathelement path="${built.classdir}"/>
</path>
@@ -115,12 +115,6 @@
<include name="com/netscape/management/admserv/**/*.jpg" />
</fileset>
</jar>
- <exec executable="ln" dir="${package.dir}"
vmlauncher="true">
- <arg line="-s ${admservconsole.name}.jar
${admservconsole.gen.name}.jar"/>
- </exec>
- <exec executable="ln" dir="${package.dir}"
vmlauncher="true">
- <arg line="-s ${admservconsole.name}_${lang}.jar
${admservconsole.gen.name}_${lang}.jar"/>
- </exec>
</target>
<!-- Javadoc -->