Attachment 160535 Details for Bug 250636 – CVS Diffs

[patch] CVS Diffs

diffs.txt (text/plain), 4.85 KB, created by Nathan Kinder on 2007-08-02 16:27:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nathan Kinder

Created: 2007-08-02 16:27:53 UTC

Size: 4.85 KB

patch

obsolete

>Index: build.xml
>===================================================================
>RCS file: /cvs/dirsec/directoryconsole/build.xml,v
>retrieving revision 1.9
>diff -u -5 -t -r1.9 build.xml
>--- build.xml	30 Jul 2007 18:10:08 -0000	1.9
>+++ build.xml	2 Aug 2007 06:18:44 -0000
>@@ -80,13 +80,13 @@
>   
>   <target name="build" depends="import_console">
>     
>     <path id="ldapconsole.classpath">
>       <fileset dir="${console.location}">
>-        <include name="**/fedora-idm-console-base-*.jar"/>
>-        <include name="**/fedora-mcc-*.jar"/>
>-        <include name="**/fedora-nmclf-*.jar"/>
>+        <include name="**/idm-console-base-*.jar"/>
>+        <include name="**/idm-console-mcc-*.jar"/>
>+        <include name="**/idm-console-nmclf-*.jar"/>
>         <include name="**/ldapjdk.jar"/> 
>       </fileset>
>       <pathelement path="${built.classdir}"/>
>     </path>
>     
>Index: fedora-ds-console.spec
>===================================================================
>RCS file: /cvs/dirsec/directoryconsole/fedora-ds-console.spec,v
>retrieving revision 1.2
>diff -u -5 -t -r1.2 fedora-ds-console.spec
>--- fedora-ds-console.spec	30 Jul 2007 18:10:08 -0000	1.2
>+++ fedora-ds-console.spec	2 Aug 2007 06:18:44 -0000
>@@ -1,65 +1,70 @@
> %define major_version 1.1
> %define minor_version 0
> 
>+%define shortname fedora-ds
>+
> Name: fedora-ds-console
> Version: %{major_version}.%{minor_version}
>-Release: 2
>+Release: 3
>+Summary: Fedora Directory Server Management Console
>+
> Group: Applications
>-Vendor: Fedora Project
>-URL: http://directory.fedora.redhat.com
> License: LGPL
>-Packager: Red Hat, Inc. <http://bugzilla.redhat.com/bugzilla>
>-Summary: Fedora Directory Server Management Console
>-BuildRoot: %{_tmppath}/%{name}-%{version}-root
>+URL: http://directory.fedoraproject.org
>+
>+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> BuildArch: noarch
>-Source: %{name}-%{version}.tar.gz
>-Autoreq: 0
>-AutoReqProv: no
>-BuildPreReq: ant >= 1.6.2, ldapjdk >= 4.18, fedora-idm-console-framework >= 1.1
>+Source: %{name}-%{version}.tar.bz2
>+Requires: %{shortname}-admin >= 1.1
>+BuildRequires: ant >= 1.6.2
>+BuildRequires: ldapjdk
>+BuildRequires: idm-console-framework >= 1.1
> 
> %description
> A Java based remote management console used for Managing Fedora
> Directory Server.
> 
>-# prep and setup expect there to be a Source file
>-# in the /usr/src/redhat/SOURCES directory - it will be unpacked
>-# in the _builddir (not BuildRoot)
> %prep
> %setup -q
>                                                                                 
> %build
>-cd directoryconsole
>-ant -Dconsole.location=/usr/share/java
>-                                                                                
>+%{ant} \
>+    -Dconsole.location=%{_javadir} \
>+    -Dbuilt.dir=`pwd`/built
>+
> %install
> rm -rf $RPM_BUILD_ROOT
>-install -d $RPM_BUILD_ROOT/usr/share/java
>-install -m777 built/package/fedora-ds* $RPM_BUILD_ROOT/usr/share/java
>+install -d $RPM_BUILD_ROOT%{_datadir}/%{shortname}/html/java
>+install -m777 built/package/%{shortname}* $RPM_BUILD_ROOT%{_datadir}/%{shortname}/html/java
>+
>+# create symlinks
>+pushd $RPM_BUILD_ROOT%{_datadir}/%{shortname}/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)
>-/usr/share/java/fedora-ds-%{version}.jar
>-/usr/share/java/fedora-ds-%{version}_en.jar
>+%{_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
>                                                                                 
>-%post
>-cd /usr/share/java
>-ln -s fedora-ds-%{version}.jar fedora-ds-%{major_version}.jar
>-ln -s fedora-ds-%{version}.jar fedora-ds.jar
>-ln -s fedora-ds-%{version}_en.jar fedora-ds-%{major_version}_en.jar
>-ln -s fedora-ds-%{version}_en.jar fedora-ds_en.jar
>-
>-%preun
>-rm -rf /usr/share/java/fedora-ds-%{major_version}.jar
>-rm -rf /usr/share/java/fedora-ds.jar
>-rm -rf /usr/share/java/fedora-ds-%{major_version}_en.jar
>-rm -rf /usr/share/java/fedora-ds_en.jar
>-
> %changelog
>+* 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.
>+
> * Mon Jul 30 2007 Nathan Kinder <nkinder@redhat.com> 1.1.0-2
> - Updated requirements.
> 
> * Mon Nov 14 2005 Nathan Kinder <nkinder@redhat.com> 1.1.0-1
> - Initial creation

Actions: View | Diff

Attachments on bug 250636: 160535