Attachment 161234 Details for Bug 252036 – Revised Diffs

[patch] Revised Diffs

diffs.txt (text/plain), 3.29 KB, created by Nathan Kinder on 2007-08-13 22:07:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nathan Kinder

Created: 2007-08-13 22:07:58 UTC

Size: 3.29 KB

patch

obsolete

>Index: fedora-ds-console.spec
>===================================================================
>RCS file: /cvs/dirsec/directoryconsole/fedora-ds-console.spec,v
>retrieving revision 1.3
>diff -u -5 -t -r1.3 fedora-ds-console.spec
>--- fedora-ds-console.spec	2 Aug 2007 16:59:52 -0000	1.3
>+++ fedora-ds-console.spec	13 Aug 2007 21:55:07 -0000
>@@ -1,13 +1,14 @@
> %define major_version 1.1
> %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
> License: LGPL
> URL: http://directory.fedoraproject.org
>@@ -32,15 +33,19 @@
>     -Dconsole.location=%{_javadir} \
>     -Dbuilt.dir=`pwd`/built
> 
> %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
> ln -s %{shortname}-%{version}_en.jar %{shortname}_en.jar
> popd
>@@ -48,18 +53,26 @@
> %clean
> rm -rf $RPM_BUILD_ROOT
> 
> %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@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@redhat.com> 1.1.0-3
> - Updated build requirement for new console framework package.
> Updated install location and Admin Server dependency. Also did
> some specfile cleanup.
>

Actions: View | Diff

Attachments on bug 252036: 161231 | 161232 | 161234 | 161235