[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[Fedora-directory-commits] directoryconsole build.xml, 1.9, 1.10 fedora-ds-console.spec, 1.2, 1.3



Author: nkinder

Update of /cvs/dirsec/directoryconsole
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6287

Modified Files:
	build.xml fedora-ds-console.spec 
Log Message:
Resolves: 250636
Summary: Updated console framework dependency and jarfile install path.



Index: build.xml
===================================================================
RCS file: /cvs/dirsec/directoryconsole/build.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- build.xml	30 Jul 2007 18:10:08 -0000	1.9
+++ build.xml	2 Aug 2007 16:59:52 -0000	1.10
@@ -82,9 +82,9 @@
     <!-- Construct classpath -->
     <path id="ldapconsole.classpath">
       <fileset dir="${console.location}">
-        <include name="**/fedora-idm-console-base-*.jar"/>
-        <include name="**/fedora-mcc-*.jar"/>
-        <include name="**/fedora-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}"/>


Index: fedora-ds-console.spec
===================================================================
RCS file: /cvs/dirsec/directoryconsole/fedora-ds-console.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fedora-ds-console.spec	30 Jul 2007 18:10:08 -0000	1.2
+++ fedora-ds-console.spec	2 Aug 2007 16:59:52 -0000	1.3
@@ -1,63 +1,68 @@
 %define major_version 1.1
 %define minor_version 0
 
+%define shortname fedora-ds
+
 Name: fedora-ds-console
 Version: %{major_version}.%{minor_version}
-Release: 2
+Release: 3
+Summary: Fedora Directory Server Management Console
+
 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
+URL: http://directory.fedoraproject.org
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
-Source: %{name}-%{version}.tar.gz
-Autoreq: 0
-AutoReqProv: no
-BuildPreReq: ant >= 1.6.2, ldapjdk >= 4.18, fedora-idm-console-framework >= 1.1
+Source: %{name}-%{version}.tar.bz2
+Requires: %{shortname}-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
 Directory 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 directoryconsole
-ant -Dconsole.location=/usr/share/java
-                                                                                
+%{ant} \
+    -Dconsole.location=%{_javadir} \
+    -Dbuilt.dir=`pwd`/built
+
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/usr/share/java
-install -m777 built/package/fedora-ds* $RPM_BUILD_ROOT/usr/share/java
+install -d $RPM_BUILD_ROOT%{_datadir}/%{shortname}/html/java
+install -m777 built/package/%{shortname}* $RPM_BUILD_ROOT%{_datadir}/%{shortname}/html/java
+
+# create symlinks
+pushd $RPM_BUILD_ROOT%{_datadir}/%{shortname}/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)
-/usr/share/java/fedora-ds-%{version}.jar
-/usr/share/java/fedora-ds-%{version}_en.jar
+%{_datadir}/%{shortname}/html/java/%{shortname}-%{version}.jar
+%{_datadir}/%{shortname}/html/java/%{shortname}-%{major_version}.jar
+%{_datadir}/%{shortname}/html/java/%{shortname}.jar
+%{_datadir}/%{shortname}/html/java/%{shortname}-%{version}_en.jar
+%{_datadir}/%{shortname}/html/java/%{shortname}-%{major_version}_en.jar
+%{_datadir}/%{shortname}/html/java/%{shortname}_en.jar
                                                                                 
-%post
-cd /usr/share/java
-ln -s fedora-ds-%{version}.jar fedora-ds-%{major_version}.jar
-ln -s fedora-ds-%{version}.jar fedora-ds.jar
-ln -s fedora-ds-%{version}_en.jar fedora-ds-%{major_version}_en.jar
-ln -s fedora-ds-%{version}_en.jar fedora-ds_en.jar
-
-%preun
-rm -rf /usr/share/java/fedora-ds-%{major_version}.jar
-rm -rf /usr/share/java/fedora-ds.jar
-rm -rf /usr/share/java/fedora-ds-%{major_version}_en.jar
-rm -rf /usr/share/java/fedora-ds_en.jar
-
 %changelog
+* Wed Aug  1 2007 Nathan Kinder <nkinder redhat com> 1.1.0-3
+- Updated build requirement for new console framework package.
+Updated install location and Admin Server dependency. Also did
+some specfile cleanup.
+
 * Mon Jul 30 2007 Nathan Kinder <nkinder redhat com> 1.1.0-2
 - Updated requirements.
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]