[Fedora-directory-commits] admservconsole fedora-admin-console.spec, NONE, 1.1 build.properties, 1.4, 1.5 build.xml, 1.2, 1.3 fedora-admserv-console.spec, 1.1, NONE

[Nathan Kinder (nkinder)]

Author: nkinder

Update of /cvs/dirsec/admservconsole
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12402

Modified Files:
	build.properties build.xml 
Added Files:
	fedora-admin-console.spec 
Removed Files:
	fedora-admserv-console.spec 
Log Message:
Resolves: 250699
Summary: Updated dependency on console framework and admin server.



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

%define dsname fedora-ds
%define shortname fedora-admin

Name: fedora-admin-console
Version: %{major_version}.%{minor_version}
Release: 1
Summary: Fedora Admin Server Management Console

Group: Applications
License: LGPL
URL: http://directory.fedoraproject.org

BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
Source: %{name}-%{version}.tar.bz2
Requires: %{dsname}-admin >= 1.1
BuildRequires: ant >= 1.6.2
BuildRequires: ldapjdk
BuildRequires: idm-console-framework >= 1.1

%description
A Java based remote management console used for Managing Fedora
Admin Server.

%prep
%setup -q
                                                                                
%build
%{ant} \
    -Dconsole.location=%{_javadir} \
    -Dbuilt.dir=`pwd`/built

%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_datadir}/%{dsname}/html/java
install -m777 built/package/%{shortname}* $RPM_BUILD_ROOT%{_datadir}/%{dsname}/html/java

# create symlinks
pushd $RPM_BUILD_ROOT%{_datadir}/%{dsname}/html/java
ln -s %{shortname}-%{version}.jar %{shortname}-%{major_version}.jar
ln -s %{shortname}-%{version}.jar %{shortname}.jar
ln -s %{shortname}-%{version}_en.jar %{shortname}-%{major_version}_en.jar
ln -s %{shortname}-%{version}_en.jar %{shortname}_en.jar
popd

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%{_datadir}/%{dsname}/html/java/%{shortname}-%{version}.jar
%{_datadir}/%{dsname}/html/java/%{shortname}-%{major_version}.jar
%{_datadir}/%{dsname}/html/java/%{shortname}.jar
%{_datadir}/%{dsname}/html/java/%{shortname}-%{version}_en.jar
%{_datadir}/%{dsname}/html/java/%{shortname}-%{major_version}_en.jar
%{_datadir}/%{dsname}/html/java/%{shortname}_en.jar
                                                                                
%changelog
* Thu Aug  2 2007 Nathan Kinder <nkinder at redhat.com> 1.1.0-1
- Initial creation


Index: build.properties
===================================================================
RCS file: /cvs/dirsec/admservconsole/build.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build.properties	9 Jul 2007 20:10:09 -0000	1.4
+++ build.properties	2 Aug 2007 23:16:15 -0000	1.5
@@ -24,5 +24,5 @@
 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}
+admservconsole.name=${brand}-admin-${admservconsole.version}
+admservconsole.gen.name=${brand}-admin-${admservconsole.gen.version}


Index: build.xml
===================================================================
RCS file: /cvs/dirsec/admservconsole/build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.xml	9 Jul 2007 20:10:09 -0000	1.2
+++ build.xml	2 Aug 2007 23:16:15 -0000	1.3
@@ -82,9 +82,9 @@
     <!-- Construct classpath -->
     <path id="admservconsole.classpath">
       <fileset dir="${console.location}">
-        <include name="**/${brand}-base-*.jar"/>
-        <include name="**/${brand}-mcc-*.jar"/>
-        <include name="**/${brand}-nmclf-*.jar"/>
+        <include name="**/idm-console-base-*.jar"/>
+        <include name="**/idm-console-mcc-*.jar"/>
+        <include name="**/idm-console-nmclf-*.jar"/>
         <include name="**/ldapjdk.jar"/> 
       </fileset>
       <pathelement path="${built.classdir}"/>


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