Attachment 930600 Details for Bug 1133643 – git patch to use maven instead of ant

[patch] git patch to use maven instead of ant

git-patch-to-use-maven.patch (text/plain), 5.92 KB, created by Fabio Alessandro Locati on 2014-08-25 16:55:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Fabio Alessandro Locati

Created: 2014-08-25 16:55:20 UTC

Size: 5.92 KB

patch

obsolete

>diff --git a/gettext-commons-0.9.6-buildxml.patch b/gettext-commons-0.9.6-buildxml.patch
>deleted file mode 100644
>index b76ce52..0000000
>--- a/gettext-commons-0.9.6-buildxml.patch
>+++ /dev/null
>@@ -1,71 +0,0 @@
>-
>-diff -Nur libgettext-commons-java-0.9/build.xml libgettext-commons-java-0.9.new/build.xml
>---- libgettext-commons-java-0.9/build.xml	1970-01-01 00:00:00.000000000 +0000
>-+++ libgettext-commons-java-0.9.new/build.xml	2007-07-24 16:14:16.000000000 +0000
>-@@ -0,0 +1,65 @@
>-+<?xml version="1.0"?>
>-+
>-+<project name="gettext-commons" default="dist-binaries" basedir=".">
>-+
>-+    <description>gettext-commons for java build file</description>
>-+
>-+    <property name="dist" location="Releases"/>
>-+    <property name="build" value="Build"/>
>-+    <property name="src" value="src/java"/>
>-+    <property name="javadoc" value="api"/>
>-+    <property name="verbose" value="true"/>
>-+    <property name="debug" value="off"/>
>-+    <property name="version" value="0.9"/>
>-+
>-+    <target name="clean" description="deletes and recreates the destination directory">
>-+        <delete verbose="${verbose}" dir="${build}"/>
>-+        <delete verbose="${verbose}" dir="${dist}"/>
>-+        <delete verbose="${verbose}" dir="${javadoc}"/>
>-+        <mkdir dir="${build}"/>
>-+        <mkdir dir="${dist}"/>
>-+    </target>
>-+
>-+    <target name="compile" description="compile the source">
>-+        <javac classpath="${classpath}"
>-+            srcdir="${src}"
>-+            destdir="${build}"
>-+            debug="${debug}"
>-+            verbose="${verbose}"/>
>-+    </target>
>-+
>-+    <target name="dist-binaries" depends="clean, compile, javadoc" description="generate binary distribution">
>-+        <jar destfile="${dist}/gettext-commons-${version}.jar" update="false">
>-+            <manifest>
>-+                <attribute name="Main-Class" value="org.xnap.commons.i18n.I18n"/>
>-+            </manifest>
>-+            <fileset dir="${build}" excludes="**/test/*.class" />
>-+        </jar>
>-+    </target>
>-+
>-+    <target name="dist-source" depends="clean, compile" description="generate source distribution">
>-+        <jar destfile="${dist}/gettext-commons-${version}-src.jar" update="false">
>-+            <fileset dir="."
>-+                includes="${src}/**/*.java, ${src}/**/*.metadata, build.xml"/>
>-+        </jar>
>-+    </target>
>-+
>-+    <target name="javadoc" description="generate javadoc documentation">
>-+        <javadoc
>-+            destdir="${javadoc}"
>-+            defaultexcludes="yes"
>-+            author="true"
>-+            version="true"
>-+            use="true"
>-+            access="protected"
>-+            windowtitle="gettext-commons javadoc"
>-+            failonerror="true">
>-+            <packageset dir="${src}" defaultexcludes="yes">
>-+                <include name="org/xnap/commons/i18n/**"/>
>-+            </packageset>
>-+        </javadoc>
>-+    </target>
>-+
>-+    <target name="all" depends="dist-source, dist-binaries, javadoc" description="prepare source and binary distributions, and javadoc"/>
>-+
>-+</project>
>-
>diff --git a/gettext-commons.spec b/gettext-commons.spec
>index 3d41cb9..46a6237 100644
>--- a/gettext-commons.spec
>+++ b/gettext-commons.spec
>@@ -1,27 +1,22 @@
> Name:           gettext-commons
> Version:        0.9.6
>-Release:        11%{?dist}
>+Release:        12%{?dist}
> Summary:        Java internationalization (i18n) library
> 
> Group:          Development/Libraries
> License:        LGPLv2+
> URL:            http://code.google.com/p/gettext-commons/
> Source0:        http://gettext-commons.googlecode.com/files/%{name}-%{version}-src.tar.gz
>-# This patch is from Debian
>-Patch0:         %{name}-0.9.6-buildxml.patch
>-# Fix some javadoc warnings
>-# http://code.google.com/p/gettext-commons/issues/detail?id=36
>-Patch1:         %{name}-0.9.6-javadoc.patch
>+Patch0:         %{name}-0.9.6-javadoc.patch
> BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> 
> BuildArch:      noarch
> BuildRequires:  jpackage-utils
> BuildRequires:  java-devel
>-BuildRequires:  ant
>+BuildRequires:  maven-local
> Requires:       jpackage-utils
> Requires:       java-headless
> 
>-
> %description
> The Gettext Commons project provides Java classes for internationalization 
> (i18n) through GNU gettext.
>@@ -31,69 +26,37 @@ with the widely used Java ResourceBundles. This makes it possible to use the
> original text instead of arbitrary property keys, which is less cumbersome 
> and makes programs easier to read.
> 
>-
> %package javadoc
> Summary:        Javadocs for %{name}
> Group:          Documentation
> Requires:       %{name} = %{version}-%{release}
> Requires:       jpackage-utils
> 
>-
> %description javadoc
> This package contains the API documentation for %{name}.
> 
>-
> %prep
> %setup -q
> %patch0 -p1
>-%patch1 -p1
>-
>-# Remove pre-built JAR and class files
>-find -name '*.jar' -exec rm -f '{}' \;
>-find -name '*.class' -exec rm -f '{}' \;
>-
> 
> %build
>-ant
>-
>+%mvn_build -f
> 
> %install
>-rm -rf $RPM_BUILD_ROOT
>-
>-mkdir -p $RPM_BUILD_ROOT%{_javadir}
>-cp -p Releases/%{name}-0.9.jar   \
>-  $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
>-
>-
>-# javadoc
>-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
>-cp -rp api/*  \
>-  $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
>-
>-#javadoc alias
>-pushd $RPM_BUILD_ROOT%{_javadocdir}
>-ln -sf %{name}-%{version} %{name}
>-popd
>-
>-
>+%mvn_install
> 
> %clean
> rm -rf $RPM_BUILD_ROOT
> 
>+%files -f .mfiles
>+%dir %{_javadir}/%{name}
> 
>-%files
>-%defattr(-,root,root,-)
>-%{_javadir}/%{name}.jar
>-%doc ChangeLog LICENSE.txt README
>-
>-
>-%files javadoc
>-%defattr(-,root,root,-)
>-%{_javadocdir}/%{name}
>-%{_javadocdir}/%{name}-%{version}
>-
>+%files javadoc -f .mfiles-javadoc
> 
> %changelog
>+* Mon Aug 25 2014 Fabio Alessandro Locati <fabiolocati@gmail.com> - 0.9.6-12
>+- Make the package building with maven since upstream they use maven
>+
> * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.6-11
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
>

Actions: View | Diff

Attachments on bug 1133643: 930600