[Fedora-directory-commits] directoryconsole build.properties, 1.7, 1.8 fedora-ds-console.spec, 1.5, 1.6

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

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

Modified Files:
	build.properties fedora-ds-console.spec 
Log Message:
Resolves: bug 428357
Description: Review Request: fedora-ds-console: Fedora Directory Server Management Console
Fix Description: Bump version to 1.1.1 - add LICENSE


Index: build.properties
===================================================================
RCS file: /cvs/dirsec/directoryconsole/build.properties,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- build.properties	2 Jul 2007 19:44:08 -0000	1.7
+++ build.properties	14 Jan 2008 19:39:20 -0000	1.8
@@ -21,7 +21,7 @@
 lang=en
 
 ldapconsole.root=..
-ldapconsole.version=1.1.0
+ldapconsole.version=1.1.1
 ldapconsole.gen.version=1.1
 brand=fedora
 ldapconsole.name=${brand}-ds-${ldapconsole.version}


Index: fedora-ds-console.spec
===================================================================
RCS file: /cvs/dirsec/directoryconsole/fedora-ds-console.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fedora-ds-console.spec	19 Dec 2007 20:11:31 -0000	1.5
+++ fedora-ds-console.spec	14 Jan 2008 19:39:20 -0000	1.6
@@ -1,25 +1,27 @@
 %define major_version 1.1
-%define minor_version 0
+%define minor_version 1
 
 %define shortname fedora-ds
 %define pkgname   dirsrv
 
 Name: fedora-ds-console
 Version: %{major_version}.%{minor_version}
-Release: 5%{?dist}
+Release: 1%{?dist}
 Summary: Fedora Directory Server Management Console
 
-Group: Applications
-License: LGPL
+Group: Applications/System
+License: GPLv2
 URL: http://directory.fedoraproject.org
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 Source: http://directory.fedoraproject.org/sources/%{name}-%{version}.tar.bz2
 Requires: %{shortname}-admin
+Requires: java-1.7.0-icedtea
 BuildRequires: ant >= 1.6.2
 BuildRequires: ldapjdk
 BuildRequires: idm-console-framework
+BuildRequires: java-1.7.0-icedtea-devel
 
 %description
 A Java based remote management console used for Managing Fedora
@@ -36,7 +38,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/html/java
-install -m777 built/package/%{shortname}* $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/html/java
+install -m644 built/package/%{shortname}* $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/html/java
 install -d $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/manual/en/slapd/help
 install -m644 help/en/*.html $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/manual/en/slapd
 install -m644 help/en/tokens.map $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/manual/en/slapd
@@ -54,7 +56,8 @@
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
+%doc LICENSE
 %{_datadir}/%{pkgname}/html/java/%{shortname}-%{version}.jar
 %{_datadir}/%{pkgname}/html/java/%{shortname}-%{major_version}.jar
 %{_datadir}/%{pkgname}/html/java/%{shortname}.jar
@@ -67,6 +70,11 @@
 %doc %{_datadir}/%{pkgname}/manual/en/slapd/help/*.html
                                                                                 
 %changelog
+* Thu Jan 10 2008 Rich Megginson <rmeggins at redhat.com> 1.1.1-1
+- changes for fedora package review
+- added requires for icedtea java
+- added LICENSE
+
 * Wed Dec 19 2007 Rich Megginson <rmeggins at redhat.com> 1.1.0-5
 - This is for the Fedora DS 1.1 release