Attachment 212671 Details for Bug 314481 – patch

[patch] patch

fds-dirconsole-build.diff (text/plain), 6.78 KB, created by jmccann on 2007-10-01 18:51:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: jmccann

Created: 2007-10-01 18:51:40 UTC

Size: 6.78 KB

patch

obsolete

>Index: build.properties
>===================================================================
>RCS file: /cvs/dirsec/directoryconsole/build.properties,v
>retrieving revision 1.7
>diff -p -u -8 -r1.7 build.properties
>--- build.properties	2 Jul 2007 19:44:08 -0000	1.7
>+++ build.properties	1 Oct 2007 18:50:21 -0000
>@@ -19,10 +19,10 @@
> # Properties to control the build
> 
> lang=en
> 
> ldapconsole.root=..
> ldapconsole.version=1.1.0
> ldapconsole.gen.version=1.1
> brand=fedora
>-ldapconsole.name=${brand}-ds-${ldapconsole.version}
>-ldapconsole.gen.name=${brand}-ds-${ldapconsole.gen.version}
>+ldapconsole.name=${brand}-ds-console-${ldapconsole.version}
>+ldapconsole.gen.name=${brand}-ds-console-${ldapconsole.gen.version}
>Index: build.xml
>===================================================================
>RCS file: /cvs/dirsec/directoryconsole/build.xml,v
>retrieving revision 1.12
>diff -p -u -8 -r1.12 build.xml
>--- build.xml	17 Aug 2007 23:20:40 -0000	1.12
>+++ build.xml	1 Oct 2007 18:50:21 -0000
>@@ -20,16 +20,18 @@ END COPYRIGHT BLOCK
> 
> <project name="ldapconsole" default="dist" basedir=".">
>   
>   <property file="build.properties"/>
> 
>   
>   <property name="built.dir"       value="${ldapconsole.root}/built"/>
>   <property name="package.dir"     value="${built.dir}/package"/>
>+  <property name="srcdist.dir"      value="${built.dir}/srcdist"/>
>+  <property name="dist.dir"         value="${built.dir}/dist"/>
>   <property name="built.classdir"  value="${built.dir}/classes"/>
>   <property name="javadoc.dir"     value="${built.dir}/doc"/>
>   <property name="imports.dir"     value="${ldapconsole.root}/imports"/>
>   <property name="java.src.dir"    value="src"/>
> 
>   
>   <property name="ldapjdk.location" value="/usr/share/java"/>
> 
>@@ -37,16 +39,17 @@ END COPYRIGHT BLOCK
>   <target name="prepare_build">
>     
>     <mkdir dir="${built.classdir}"/>
>   </target>
> 
>   <target name="prepare_dist">
>     
>     <mkdir dir="${package.dir}"/>
>+    <mkdir dir="${dist.dir}"/>
>   </target>
> 
>   <target name="prepare_doc">
>     
>     <mkdir dir="${javadoc.dir}"/>
>   </target>
> 
>   
>@@ -129,16 +132,43 @@ END COPYRIGHT BLOCK
>     
>     <exec dir="${java.src.dir}/com/netscape/admin/dirserv"
>           executable="sh"
>           spawn="true">
>           <arg value="filelist.sh"/>
>     </exec>
>   </target>
> 
>+  
>+  <target name="srcdist" depends="clean,prepare_dist" description="Creates the source distribution">
>+    <copy todir="${srcdist.dir}">
>+      <fileset dir=".">
>+         <include name="build.properties" />
>+         <include name="build.xml" />
>+         <include name="LICENSE" />
>+         <include name="startconsole-sandbox" />
>+         <include name="fedora-ds-console.spec" />
>+         <include name="imports.*" />
>+         <include name="help/**" />
>+         <include name="src/**" />
>+         <exclude name="**/CVS/**" />
>+      </fileset>
>+    </copy>
>+
>+    
>+    <tar destfile="${dist.dir}/${ldapconsole.name}-src.tar.gz"
>+         compression="gzip">
>+      <tarfileset dir="${srcdist.dir}"
>+                  prefix="${ldapconsole.name}"
>+                  mode="755">
>+        <include name="**" />
>+      </tarfileset>
>+    </tar>
>+  </target>
>+
>   
>   <target name="dist" depends="build,prepare_dist">
>     
>     <jar jarfile="${package.dir}/${ldapconsole.name}.jar" >
>       <fileset dir="${built.classdir}">
>         <include name="com/**/*.class" />
>         <include name="com/netscape/admin/dirserv/ds.tt"/>
>       </fileset>
>Index: fedora-ds-console.spec
>===================================================================
>RCS file: /cvs/dirsec/directoryconsole/fedora-ds-console.spec,v
>retrieving revision 1.4
>diff -p -u -8 -r1.4 fedora-ds-console.spec
>--- fedora-ds-console.spec	13 Aug 2007 22:28:08 -0000	1.4
>+++ fedora-ds-console.spec	1 Oct 2007 18:50:21 -0000
>@@ -10,17 +10,17 @@ Release: 4
> Summary: Fedora Directory Server Management Console
> 
> Group: Applications
> License: LGPL
> URL: http://directory.fedoraproject.org
> 
> BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> BuildArch: noarch
>-Source: %{name}-%{version}.tar.bz2
>+Source: %{name}-%{version}-src.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.
>@@ -39,33 +39,33 @@ install -d $RPM_BUILD_ROOT%{_datadir}/%{
> 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}/%{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
>+ln -s %{name}-%{version}.jar %{name}-%{major_version}.jar
>+ln -s %{name}-%{version}.jar %{name}.jar
>+ln -s %{name}-%{version}_en.jar %{name}-%{major_version}_en.jar
>+ln -s %{name}-%{version}_en.jar %{name}_en.jar
> popd
> 
> %clean
> rm -rf $RPM_BUILD_ROOT
> 
> %files
> %defattr(-,root,root)
>-%{_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
>+%{_datadir}/%{pkgname}/html/java/%{name}-%{version}.jar
>+%{_datadir}/%{pkgname}/html/java/%{name}-%{major_version}.jar
>+%{_datadir}/%{pkgname}/html/java/%{name}.jar
>+%{_datadir}/%{pkgname}/html/java/%{name}-%{version}_en.jar
>+%{_datadir}/%{pkgname}/html/java/%{name}-%{major_version}_en.jar
>+%{_datadir}/%{pkgname}/html/java/%{name}_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

Actions: View | Diff

Attachments on bug 314481: 212671