From dda00d8fb7684033deb6ae71a0ce63013997513a Mon Sep 17 00:00:00 2001
From: Nathan Kinder <nkinder@redhat.com>
Date: Aug 02 2007 23:16:15 +0000
Subject: Resolves: 250699

Summary: Updated dependency on console framework and admin server.

---

diff --git a/build.properties b/build.properties
index 3f8a11e..ff2cf71 100755
--- a/build.properties
+++ b/build.properties
@@ -24,5 +24,5 @@ admservconsole.root=..
 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}
diff --git a/build.xml b/build.xml
index 8aaaf0f..809d363 100644
--- a/build.xml
+++ b/build.xml
@@ -82,9 +82,9 @@ END COPYRIGHT BLOCK
     <!-- 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}"/>
diff --git a/fedora-admin-console.spec b/fedora-admin-console.spec
new file mode 100755
index 0000000..c0bdf2c
--- /dev/null
+++ b/fedora-admin-console.spec
@@ -0,0 +1,63 @@
+%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@redhat.com> 1.1.0-1
+- Initial creation
diff --git a/fedora-admserv-console.spec b/fedora-admserv-console.spec
deleted file mode 100755
index 9f715c4..0000000
--- a/fedora-admserv-console.spec
+++ /dev/null
@@ -1,62 +0,0 @@
-%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@redhat.com> 1.1.0-1
-- Initial creation