[Fedora-directory-commits] admservconsole fedora-admin-console.spec, 1.3, 1.4

[Doctor Conrad]

Author: rmeggins

Update of /cvs/dirsec/admservconsole
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14635

Modified Files:
    fedora-admin-console.spec 
Log Message:
fix symlinks

Index: fedora-admin-console.spec
===================================================================
RCS file: /cvs/dirsec/admservconsole/fedora-admin-console.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fedora-admin-console.spec	9 Aug 2007 16:26:13 -0000	1.3
+++ fedora-admin-console.spec	7 Nov 2007 22:07:17 -0000	1.4
@@ -3,10 +3,11 @@

%define dsname fedora-ds
 %define shortname fedora-admin
+%define pkgname dirsrv

Name: fedora-admin-console
 Version: %{major_version}.%{minor_version}
-Release: 2
+Release: 3%{?dist}
 Summary: Fedora Admin Server Management Console

Group: Applications
@@ -35,15 +36,15 @@

%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
-install -d $RPM_BUILD_ROOT%{_datadir}/%{dsname}/manual/en/admin/help
-install -m644 help/en/*.html $RPM_BUILD_ROOT%{_datadir}/%{dsname}/manual/en/admin
-install -m644 help/en/tokens.map $RPM_BUILD_ROOT%{_datadir}/%{dsname}/manual/en/admin
-install -m644 help/en/help/*.html $RPM_BUILD_ROOT%{_datadir}/%{dsname}/manual/en/admin/help
+install -d $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/html/java
+install -m777 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}/%{dsname}/html/java
+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
@@ -55,18 +56,21 @@

%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
-%dir %{_datadir}/%{dsname}/manual/en/admin
-%{_datadir}/%{dsname}/manual/en/admin/tokens.map
-%doc %{_datadir}/%{dsname}/manual/en/admin/*.html
-%doc %{_datadir}/%{dsname}/manual/en/admin/help/*.html
-                                                                                
+%{_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 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.