Author: rmeggins
Update of /cvs/dirsec/admservconsole
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13676/admservconsole
Modified Files:
build.properties fedora-admin-console.spec
Log Message:
Resolves: bug 428364
Description: Review Request: fedora-admin-console: Fedora Directory Administration Server
Management Console
Fix Description: Bump version to 1.1.1 - add LICENSE
Index: build.properties
===================================================================
RCS file: /cvs/dirsec/admservconsole/build.properties,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build.properties 2 Aug 2007 23:16:15 -0000 1.5
+++ build.properties 14 Jan 2008 19:42:48 -0000 1.6
@@ -21,7 +21,7 @@
lang=en
admservconsole.root=..
-admservconsole.version=1.1.0
+admservconsole.version=1.1.1
admservconsole.gen.version=1.1
brand=fedora
admservconsole.name=${brand}-admin-${admservconsole.version}
Index: fedora-admin-console.spec
===================================================================
RCS file: /cvs/dirsec/admservconsole/fedora-admin-console.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fedora-admin-console.spec 19 Dec 2007 20:13:44 -0000 1.5
+++ fedora-admin-console.spec 14 Jan 2008 19:42:48 -0000 1.6
@@ -1,5 +1,5 @@
%define major_version 1.1
-%define minor_version 0
+%define minor_version 1
%define dsname fedora-ds
%define shortname fedora-admin
@@ -7,20 +7,22 @@
Name: fedora-admin-console
Version: %{major_version}.%{minor_version}
-Release: 4%{?dist}
+Release: 1%{?dist}
Summary: Fedora Admin 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: %{dsname}-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
@@ -37,7 +39,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/admin/help
install -m644 help/en/*.html $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/manual/en/admin
install -m644 help/en/tokens.map $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/manual/en/admin
@@ -55,7 +57,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
@@ -68,6 +71,11 @@
%doc %{_datadir}/%{pkgname}/manual/en/admin/help/*.html
%changelog
+* Thu Jan 10 2008 Rich Megginson <rmeggins(a)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(a)redhat.com> - 1.1.0-4
- This is for the Fedora DS 1.1 release