[Fedora-directory-commits] directoryconsole fedora-ds-console.spec, 1.3, 1.4

[Nathan Kinder (nkinder)]

Author: nkinder

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

Modified Files:
	fedora-ds-console.spec 
Log Message:
Resolves: 252036
Summary: Added online help files to fedora-ds-console package.



Index: fedora-ds-console.spec
===================================================================
RCS file: /cvs/dirsec/directoryconsole/fedora-ds-console.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fedora-ds-console.spec	2 Aug 2007 16:59:52 -0000	1.3
+++ fedora-ds-console.spec	13 Aug 2007 22:28:08 -0000	1.4
@@ -2,10 +2,11 @@
 %define minor_version 0
 
 %define shortname fedora-ds
+%define pkgname   dirsrv
 
 Name: fedora-ds-console
 Version: %{major_version}.%{minor_version}
-Release: 3
+Release: 4
 Summary: Fedora Directory Server Management Console
 
 Group: Applications
@@ -34,11 +35,15 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_datadir}/%{shortname}/html/java
-install -m777 built/package/%{shortname}* $RPM_BUILD_ROOT%{_datadir}/%{shortname}/html/java
+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/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
+install -m644 help/en/help/*.html $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/manual/en/slapd/help
 
 # create symlinks
-pushd $RPM_BUILD_ROOT%{_datadir}/%{shortname}/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
@@ -50,14 +55,22 @@
 
 %files
 %defattr(-,root,root)
-%{_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
+%{_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/slapd
+%{_datadir}/%{pkgname}/manual/en/slapd/tokens.map
+%doc %{_datadir}/%{pkgname}/manual/en/slapd/*.html
+%doc %{_datadir}/%{pkgname}/manual/en/slapd/help/*.html
                                                                                 
 %changelog
+* Mon Aug 13 2007 Nathan Kinder <nkinder at redhat.com> 1.1.0-4
+- Added online help files to package. Use pkgname for filesystem
+  path naming instead of shortname.
+
 * Wed Aug  1 2007 Nathan Kinder <nkinder at redhat.com> 1.1.0-3
 - Updated build requirement for new console framework package.
 Updated install location and Admin Server dependency. Also did