From 7bd093fb11bd303aed5313fbf912b24e61e47c5b Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Jan 16 2008 18:29:07 +0000 Subject: Bug 428364 Description: Review Request: fedora-admin-console: Fedora Directory Administration Server Management Console Fix Description: rename package from "fedora-admin-console" to "fedora-ds-admin-console" --- diff --git a/fedora-admin-console.spec b/fedora-admin-console.spec deleted file mode 100755 index 8be64c5..0000000 --- a/fedora-admin-console.spec +++ /dev/null @@ -1,89 +0,0 @@ -%define major_version 1.1 -%define minor_version 1 - -%define dsname fedora-ds -%define shortname fedora-admin -%define pkgname dirsrv - -Name: fedora-admin-console -Version: %{major_version}.%{minor_version} -Release: 1%{?dist} -Summary: Fedora Admin Server Management Console - -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 -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}/%{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 -install -m644 help/en/help/*.html $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/manual/en/admin/help - -# create symlinks -pushd $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/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,-) -%doc LICENSE -%{_datadir}/%{pkgname}/html/java/%{shortname}-%{version}.jar -%{_datadir}/%{pkgname}/html/java/%{shortname}-%{major_version}.jar -%{_datadir}/%{pkgname}/html/java/%{shortname}.jar -%{_datadir}/%{pkgname}/html/java/%{shortname}-%{version}_en.jar -%{_datadir}/%{pkgname}/html/java/%{shortname}-%{major_version}_en.jar -%{_datadir}/%{pkgname}/html/java/%{shortname}_en.jar -%dir %{_datadir}/%{pkgname}/manual/en/admin -%{_datadir}/%{pkgname}/manual/en/admin/tokens.map -%doc %{_datadir}/%{pkgname}/manual/en/admin/*.html -%doc %{_datadir}/%{pkgname}/manual/en/admin/help/*.html - -%changelog -* Thu Jan 10 2008 Rich Megginson 1.1.1-1 -- changes for fedora package review -- added requires for icedtea java -- added LICENSE - -* Wed Dec 19 2007 Rich Megginson - 1.1.0-4 -- This is for the Fedora DS 1.1 release - -* Thu Oct 25 2007 Rich Megginson - 1.1.0-3 -- updated sources - use dirsrv as package name - -* Wed Aug 8 2007 Nathan Kinder 1.1.0-2 -- Added online help files into package. - -* Thu Aug 2 2007 Nathan Kinder 1.1.0-1 -- Initial creation diff --git a/fedora-ds-admin-console.spec b/fedora-ds-admin-console.spec new file mode 100755 index 0000000..df8678b --- /dev/null +++ b/fedora-ds-admin-console.spec @@ -0,0 +1,93 @@ +%define major_version 1.1 +%define minor_version 1 + +%define dsname fedora-ds +%define shortname fedora-admin +%define pkgname dirsrv + +Name: fedora-ds-admin-console +Version: %{major_version}.%{minor_version} +Release: 2%{?dist} +Summary: Fedora Admin Server Management Console + +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 +Obsoletes: fedora-admin-console + +%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}/%{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 +install -m644 help/en/help/*.html $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/manual/en/admin/help + +# create symlinks +pushd $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/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,-) +%doc LICENSE +%{_datadir}/%{pkgname}/html/java/%{shortname}-%{version}.jar +%{_datadir}/%{pkgname}/html/java/%{shortname}-%{major_version}.jar +%{_datadir}/%{pkgname}/html/java/%{shortname}.jar +%{_datadir}/%{pkgname}/html/java/%{shortname}-%{version}_en.jar +%{_datadir}/%{pkgname}/html/java/%{shortname}-%{major_version}_en.jar +%{_datadir}/%{pkgname}/html/java/%{shortname}_en.jar +%dir %{_datadir}/%{pkgname}/manual/en/admin +%{_datadir}/%{pkgname}/manual/en/admin/tokens.map +%doc %{_datadir}/%{pkgname}/manual/en/admin/*.html +%doc %{_datadir}/%{pkgname}/manual/en/admin/help/*.html + +%changelog +* Wed Jan 16 2008 Rich Megginson 1.1.1-2 +- rename package to fedora-ds-admin-console + +* Thu Jan 10 2008 Rich Megginson 1.1.1-1 +- changes for fedora package review +- added requires for icedtea java +- added LICENSE + +* Wed Dec 19 2007 Rich Megginson - 1.1.0-4 +- This is for the Fedora DS 1.1 release + +* Thu Oct 25 2007 Rich Megginson - 1.1.0-3 +- updated sources - use dirsrv as package name + +* Wed Aug 8 2007 Nathan Kinder 1.1.0-2 +- Added online help files into package. + +* Thu Aug 2 2007 Nathan Kinder 1.1.0-1 +- Initial creation