Attachment 785163 Details for Bug 993710 – fix rhbz#992092, rhbz#993710

[patch] fix rhbz#992092, rhbz#993710

0001-fix-rhbz-992092-rhbz-993710.patch (text/plain), 11.04 KB, created by gil cattaneo on 2013-08-10 11:00:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: gil cattaneo

Created: 2013-08-10 11:00:56 UTC

Size: 11.04 KB

patch

obsolete

>From 4a5aa2587ca1ef7bfc36c438bb8d6c49a6140ca4 Mon Sep 17 00:00:00 2001
>From: gil <puntogil@libero.it>
>Date: Sat, 10 Aug 2013 12:58:21 +0200
>Subject: [PATCH] fix rhbz#992092, rhbz#993710
>
>---
> cpptasks.spec | 252 +++++++++++++++++++++++++++++++++++++---------------------
> 1 file changed, 160 insertions(+), 92 deletions(-)
>
>diff --git a/cpptasks.spec b/cpptasks.spec
>index 1e745f5..402fb97 100644
>--- a/cpptasks.spec
>+++ b/cpptasks.spec
>@@ -1,29 +1,31 @@
>-Name:		cpptasks
>-Version:	1.0b5
>-Release:	10%{?dist}
>-Summary:	Compile and link task for ant
>-
>-Group:		Development/Libraries
>-
>-License:	ASL 2.0
>-URL:		http://ant-contrib.sourceforge.net/
>-Vendor:		Ant contrib project
>-Source0:	http://downloads.sourceforge.net/ant-contrib/cpptasks-1.0b5.tar.gz
>-Source1:	%{name}-README.fedora
>-
>-BuildRequires:	ant 
>-BuildRequires:	ant-junit 
>-BuildRequires:	jpackage-utils 
>-BuildRequires:	junit
>-#BuildRequires:	mave
>-
>-Requires:	ant 
>-Requires:	java
>-Requires:	jpackage-utils
>-
>-BuildArch:	noarch
>-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
>-	
>+%global with_ant 0
>+Name:           cpptasks
>+Version:        1.0b5
>+Release:        11%{?dist}
>+Summary:        Compile and link task for ant
>+License:        ASL 2.0
>+URL:            http://ant-contrib.sourceforge.net/
>+#Vendor:         Ant contrib project
>+Source0:        http://downloads.sourceforge.net/ant-contrib/%{name}-%{version}.tar.gz
>+Source1:        %{name}-README.fedora
>+
>+BuildRequires:  mvn(org.apache.ant:ant)
>+BuildRequires:  mvn(xerces:xercesImpl)
>+# test deps
>+BuildRequires:  mvn(junit:junit)
>+%if %with_ant
>+BuildRequires:  mvn(org.apache.ant:ant-junit)
>+%else
>+BuildRequires:  maven-local
>+BuildRequires:  maven-surefire-provider-junit4
>+# site build tools
>+BuildRequires:  maven-changes-plugin
>+BuildRequires:  maven-release-plugin
>+BuildRequires:  maven-site-plugin
>+BuildRequires:  maven-skins
>+%endif
>+
>+BuildArch:      noarch
> 
> %description
> This ant task can compile various source languages and produce
>@@ -32,103 +34,169 @@ adaptors are currently available for several C/C++ compilers, FORTRAN,
> MIDL and Windows Resource files.
> 
> %package        javadoc
>-Summary:	Javadoc for %{name}
>-Group:		Documentation
>-Requires:	%{name} >= %{version}-%{release}
>-Requires:	jpackage-utils
>+Summary:        Javadoc for %{name}
> 
>-%description	javadoc
>+%description    javadoc
> Javadoc documentation for %{summary}.
> 
>+%if !%with_ant
>+%package        manual
>+Summary:        Docs for %{name}
> 
>-#The manual for b5 has been moved to xdoc (doxia) format.
>-# This requires maven, which requires many dependencies which we don't have.
>-#%package	manual
>-#Summary:	Docs for %{name}
>-#Group:		Development/Documentation
>-
>-#%description	manual
>-#User manual for %{summary}.
>+%description    manual
>+User manual for %{summary}.
>+%endif
> 
> %prep
>-%setup -q -n %{name}-%{version}
>-
>-#End of line conversion
>-%{__sed} -i 's/\r//' NOTICE 
>+%setup -q
> 
>-#Check for exisiting jar files
>-JAR_files=""
>-for j in $(find -name \*.jar); do
>-if [ ! -L $j ] ; then
>-	JAR_files="$JAR_files $j"
>-	fi
>-done
>+# Cleanup
>+find . -name '*.class' -print -delete
>+find . -name '*.jar' -print -delete
>+rm -r site
> 
>-if [ ! -z "$JAR_files" ] ; then
>-	echo "These JAR files should be deleted and symlinked to system JAR files: $JAR_files"
>-	exit 1
>-fi
>+#End of line conversion
>+sed -i 's/\r//' NOTICE 
> 
> cp -p %{SOURCE1} ./README.fedora
>+# Unavailable
>+%pom_remove_plugin :clirr-maven-plugin
>+# Unneeded
>+%pom_remove_plugin :maven-assembly-plugin
>+%pom_remove_plugin :maven-source-plugin
>+
>+# Fix some pom entries
>+%pom_xpath_inject "pom:project" "
>+<properties>
>+  <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
>+  <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
>+</properties>"
>+
>+%pom_xpath_set "pom:project/pom:dependencies/pom:dependency[pom:artifactId = 'ant' ]/pom:groupId" org.apache.ant
>+%pom_xpath_set "pom:project/pom:dependencies/pom:dependency[pom:artifactId = 'ant' ]/pom:version" 1.8.4
>+
>+%pom_xpath_inject "pom:project/pom:build/pom:plugins/pom:plugin[pom:artifactId = 'maven-surefire-plugin' ]" "<groupId>org.apache.maven.plugins</groupId>"
>+
>+%pom_xpath_inject "pom:project/pom:build/pom:plugins/pom:plugin[pom:artifactId = 'maven-compiler-plugin' ]" "<version>3.0</version>"
>+%pom_xpath_inject "pom:project/pom:build/pom:plugins/pom:plugin[pom:artifactId = 'maven-compiler-plugin' ]" "<groupId>org.apache.maven.plugins</groupId>"
>+%pom_xpath_set "pom:project/pom:build/pom:plugins/pom:plugin[pom:artifactId = 'maven-compiler-plugin' ]/pom:configuration/pom:source" 1.5
>+%pom_xpath_set "pom:project/pom:build/pom:plugins/pom:plugin[pom:artifactId = 'maven-compiler-plugin' ]/pom:configuration/pom:target" 1.5
>+
>+%pom_xpath_inject "pom:project/pom:build/pom:plugins/pom:plugin[pom:artifactId = 'maven-jar-plugin' ]" "<version>2.4</version>"
>+%pom_xpath_inject "pom:project/pom:build/pom:plugins/pom:plugin[pom:artifactId = 'maven-jar-plugin' ]" "<groupId>org.apache.maven.plugins</groupId>"
>+
>+%pom_xpath_inject "pom:project/pom:build/pom:plugins/pom:plugin[pom:artifactId = 'maven-antrun-plugin' ]" "<version>1.7</version>"
>+%pom_xpath_inject "pom:project/pom:build/pom:plugins/pom:plugin[pom:artifactId = 'maven-antrun-plugin' ]" "<groupId>org.apache.maven.plugins</groupId>"
>+%pom_xpath_remove "pom:project/pom:build/pom:plugins/pom:plugin[pom:artifactId = 'maven-antrun-plugin' ]/pom:dependencies/pom:dependency[pom:groupId = 'ant' ]"
>+%pom_xpath_inject "pom:project/pom:build/pom:plugins/pom:plugin[pom:artifactId = 'maven-antrun-plugin' ]/pom:dependencies" "
>+<dependency>
>+  <groupId>org.apache.ant</groupId>
>+  <artifactId>ant</artifactId>
>+  <version>1.8.4</version>
>+</dependency>"
>+
>+%pom_xpath_inject "pom:project/pom:build/pom:plugins/pom:plugin[pom:artifactId = 'maven-javadoc-plugin' ]" "<version>2.9.1</version>"
>+%pom_xpath_inject "pom:project/pom:build/pom:plugins/pom:plugin[pom:artifactId = 'maven-javadoc-plugin' ]" "<groupId>org.apache.maven.plugins</groupId>"
>+%pom_xpath_remove "pom:project/pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-javadoc-plugin']/pom:executions"
>+%pom_xpath_inject "pom:project/pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-javadoc-plugin']" '
>+<configuration>
>+  <doctitle>cpptasks ${project.version} API</doctitle>
>+  <windowtitle>cpptasks ${project.version} API</windowtitle>
>+  <source>1.5</source>
>+</configuration>'
>+
>+# Remove break site build
>+%pom_remove_plugin :maven-project-info-reports-plugin
>+#%%pom_xpath_inject "pom:reporting/pom:plugins/pom:plugin[pom:artifactId='maven-project-info-reports-plugin']" "<version>2.6</version>"
>+#%%pom_xpath_inject "pom:reporting/pom:plugins/pom:plugin[pom:artifactId='maven-project-info-reports-plugin']" "<groupId>org.apache.maven.plugins</groupId>"
>+
>+%pom_xpath_inject "pom:reporting/pom:plugins/pom:plugin[pom:artifactId='maven-release-plugin']" "<version>2.2.1</version>"
>+%pom_xpath_inject "pom:reporting/pom:plugins/pom:plugin[pom:artifactId='maven-release-plugin']" "<groupId>org.apache.maven.plugins</groupId>"
>+
>+%pom_xpath_inject "pom:reporting/pom:plugins/pom:plugin[pom:artifactId='maven-changes-plugin']" "<version>2.8</version>"
>+%pom_xpath_inject "pom:reporting/pom:plugins/pom:plugin[pom:artifactId='maven-changes-plugin']" "<groupId>org.apache.maven.plugins</groupId>"
>+
>+%pom_xpath_inject "pom:reporting/pom:plugins/pom:plugin[pom:artifactId='maven-javadoc-plugin']" "<version>2.9.1</version>"
>+
>+sed -i 's|<property name="javac.source" value="1.3"/>|<property name="javac.source" value="1.5"/>|' build.xml
>+sed -i 's|<property name="javac.target" value="1.1"/>|<property name="javac.target" value="1.5"/>|' build.xml
> 
> %build
>-export OPT_JAR_LIST="ant/ant-junit junit"
>-export CLASSPATH=
>-ant jars javadocs 
> 
>-#In lieu of maven built docs, which requires clirr
>-#a URL is supplied in README.fedora
>-#mvn-jpp site
>+%if %with_ant
>+export CLASSPATH=$(build-classpath xerces-j2 ant ant/ant-junit junit)
>+%ant jars javadocs
> 
>-%install
>-rm -rf $RPM_BUILD_ROOT
>+%check
>+%ant run-tests
> 
>+%else
> 
>-# jars
>-mkdir -p $RPM_BUILD_ROOT%{_javadir}/ant/
>-install -Dpm 644 target/lib/%{name}.jar \
>-	$RPM_BUILD_ROOT%{_javadir}/ant/%{name}-%{version}.jar
>+%mvn_file : ant/%{name}
>+%mvn_build -- site:site
> 
>-pushd $RPM_BUILD_ROOT%{_javadir}/ant/
>-ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/ant/%{name}.jar
>-popd
>+%endif
> 
>+%install
>+%if %with_ant
>+
>+mkdir -p %{buildroot}%{_javadir}/ant
>+install -pm 644 target/lib/%{name}.jar \
>+ %{buildroot}%{_javadir}/ant/%{name}.jar
>+
>+mkdir -p %{buildroot}%{_mavenpomdir}
>+install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.ant-%{name}.pom
>+%add_maven_depmap JPP.ant-%{name}.pom ant/%{name}.jar
>+        
> # javadoc
>-install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
>+mkdir -p %{buildroot}%{_javadocdir}/%{name}
>+cp -pr target/javadocs/* %{buildroot}%{_javadocdir}/%{name}
> 
>-cp -pr target/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
>-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
>+%else
>+%mvn_install
> 
>-# manual - 
>-#install -dm 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
>-#cp -pr docs/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
>+# Remove api docs and fix its link
>+rm -r target/site/apidocs
>+sed -i "s|apidocs/index.html|%{_javadocdir}/%{name}/index.html|" target/site/index.html
>+
>+%endif
> 
> #Place a file into ant's config dir
> mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ant.d/
> echo "%{name} ant/%{name}" > $RPM_BUILD_ROOT/%{_sysconfdir}/ant.d/%{name}
> 
>-
>-%clean
>-rm -rf $RPM_BUILD_ROOT
>-
>-%files
>-%defattr(-,root,root,-)
>+%files -f .mfiles
> %doc LICENSE NOTICE README.fedora
>-%{_javadir}/ant/*.jar
>-%{_sysconfdir}/ant.d/%{name}
>-
>-%files javadoc
>-%defattr(-,root,root,-)
>-%doc %{_javadocdir}/%{name}-%{version}
>-%doc %{_javadocdir}/%{name}
>+%config(noreplace) %{_sysconfdir}/ant.d/%{name}
> 
>-#%files manual
>-#%defattr(-,root,root,-)
>-#%doc %{_docdir}/%{name}-%{version}
>+%pre javadoc
>+[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
>+rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
> 
>+%if %with_ant
>+%files javadoc
>+%{_javadocdir}/%{name}
>+%else
>+%files javadoc -f .mfiles-javadoc
>+%endif
>+%doc LICENSE NOTICE
>+
>+%if !%with_ant
>+%files manual
>+%doc target/site/*
>+%endif
> # -----------------------------------------------------------------------------
> 
> %changelog
>+* Sat Aug 10 2013 gil cattaneo <puntogil@libero.it> 1.0b5-11
>+- fix rhbz#992092, rhbz#993710
>+- switch to XMvn
>+- resolve some rpmlint problems
>+- install LICENSE NOTICE files in javadoc sub package
>+- use pom macros
>+- minor changes to adapt to current guideline
>+- add %%pre javadoc script
>+
> * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0b5-10
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
> 
>@@ -171,7 +239,7 @@ rm -rf $RPM_BUILD_ROOT
> - Change licence to ASL 2.0 from Apache Software Licence 2.0
> - Documentation to "Documentation" Group
> 
>-* Sat Sep 02 2005 Anthony Green <green@redhat.com> - 0:1.0-0.b3.2jpp_1%{?dist}
>+* Fri Sep 02 2005 Anthony Green <green@redhat.com> - 0:1.0-0.b3.2jpp_1%{?dist}
> - Remove "ghost" for javadocs and javadoc postprocessing.
> - Place in Development/Libraries, not Development/Libraries/Java.
> - Remove epoch references.
>-- 
>1.8.3.1
>

Actions: View | Diff

Attachments on bug 993710: 785163