[apache-commons-daemon] Add forgotten source once again
by Stanislav Ochotnicky
commit 26facc3d8557e9e65b17b21118476526bc42617c
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Tue Feb 28 16:15:47 2012 +0100
Add forgotten source once again
.gitignore | 1 +
sources | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index cf8795d..b97552c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ commons-daemon-1.0.2-src.tar.gz
/commons-daemon-1.0.6-src.tar.gz
/commons-daemon-1.0.7-src.tar.gz
/commons-daemon-1.0.8-src.tar.gz
+/commons-daemon-1.0.10-src.tar.gz
diff --git a/sources b/sources
index 2f686d7..76d27c0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-323a0bd9e2786256f02c5aed4e887fed commons-daemon-1.0.8-src.tar.gz
+660f10965479baa0fe88e832e3032270 commons-daemon-1.0.10-src.tar.gz
12 years, 1 month
[apache-commons-daemon] Update to latest upstream (1.0.10)
by Stanislav Ochotnicky
commit 74097d535821fe6e4329c5cb1057bd4fe7ce29d8
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Tue Feb 28 16:03:18 2012 +0100
Update to latest upstream (1.0.10)
- Several bugfixes concerning libcap and building upstream
apache-commons-daemon.spec | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/apache-commons-daemon.spec b/apache-commons-daemon.spec
index bda84d2..8c29afe 100644
--- a/apache-commons-daemon.spec
+++ b/apache-commons-daemon.spec
@@ -3,7 +3,7 @@
%global short_name commons-%{base_name}
Name: apache-%{short_name}
-Version: 1.0.8
+Version: 1.0.10
Release: 1%{?dist}
Summary: Defines API to support an alternative invocation mechanism
License: ASL 2.0
@@ -132,6 +132,10 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%changelog
+* Thu Jan 26 2012 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 1.0.10-1
+- Update to latest upstream (1.0.10)
+- Several bugfixes concerning libcap and building upstream
+
* Thu Jan 26 2012 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 1.0.8-1
- Update to latest upstream (1.0.8)
- Drop s390/ppc patches (upstream seems to already include them)
12 years, 1 month
[Bug 797525] New: ant task exec outputproperty completely broken
by Red Hat Bugzilla
Please do not reply directly to this email. All additional
comments should be made in the comments box of this bug.
Summary: ant task exec outputproperty completely broken
https://bugzilla.redhat.com/show_bug.cgi?id=797525
Summary: ant task exec outputproperty completely broken
Product: Fedora
Version: 16
Platform: x86_64
OS/Version: Linux
Status: NEW
Severity: urgent
Priority: unspecified
Component: ant
AssignedTo: jcapik(a)redhat.com
ReportedBy: briemers(a)redhat.com
QAContact: extras-qa(a)fedoraproject.org
CC: akurtako(a)redhat.com, mmatejov(a)redhat.com,
java-sig-commits(a)lists.fedoraproject.org,
jcapik(a)redhat.com
Classification: Fedora
Story Points: ---
Type: ---
Regression: ---
Mount Type: ---
Documentation: ---
Created attachment 565894
--> https://bugzilla.redhat.com/attachment.cgi?id=565894
simple example to reproduce the bug
Description of problem:
When the exec outputproperty task is used twice with the same outputproperty
name, the outputproperty keeps the value of the first execution. This was not
true in prior versions, and is badly breaking my ant scripts. The obvious
workaround not to use the same outputproperty name twice does not work, because
there is no clear way to do that within a loop.
Version-Release number of selected component (if applicable):
ant-1.8.2-6.fc16.noarch
How reproducible:
100%
Steps to Reproduce:
1. ant -f test.xml
2. ant -f test2.xml
3.
Actual results:
[briemers@briemersw ant]$ ant -f test.xml test
Buildfile: /autohome/docbill/workspace/reports.fte2/ant/test.xml
test:
[echo] value = a
[echo] value = a
[echo] value = a
BUILD SUCCESSFUL
Total time: 1 second
[briemers@briemersw ant]$ ant -f test2.xml
Buildfile: /autohome/docbill/workspace/reports.fte2/ant/test2.xml
test:
[echo] value = a
[echo] value2 = a
[echo] value = b
[echo] value2 = a
[echo] value = c
[echo] value2 = a
BUILD SUCCESSFUL
Total time: 1 second
Expected results:
[briemers@briemersw ant]$ ant -f test.xml test
Buildfile: /autohome/docbill/workspace/reports.fte2/ant/test.xml
test:
[echo] value = a
[echo] value = b
[echo] value = c
BUILD SUCCESSFUL
Total time: 1 second
[briemers@briemersw ant]$ ant -f test2.xml
Buildfile: /autohome/docbill/workspace/reports.fte2/ant/test2.xml
test:
[echo] value = a
[echo] value2 = a
[echo] value = b
[echo] value2 = b
[echo] value = c
[echo] value2 = c
BUILD SUCCESSFUL
Total time: 1 second
Additional info:
--
Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.
12 years, 1 month
[relaxngcc/f16] Initial import for f16.
by gil
commit 36ae8b21c760b3ad14b1f18a69526cf08aa43029
Author: gil <puntogil(a)libero.it>
Date: Sat Feb 25 00:34:10 2012 +0100
Initial import for f16.
relaxngcc-build.xml | 233 +++++++++++++++++++++++++++++++++++++++++----------
relaxngcc.spec | 186 ++++++++++++++++++++++-------------------
2 files changed, 290 insertions(+), 129 deletions(-)
---
diff --git a/relaxngcc-build.xml b/relaxngcc-build.xml
index 905bd36..96c53fc 100644
--- a/relaxngcc-build.xml
+++ b/relaxngcc-build.xml
@@ -1,44 +1,191 @@
<?xml version="1.0"?>
-
-<project name="relaxngcc" default="jar">
-
- <!-- Compile Java source files: -->
- <target name="compile">
- <mkdir dir="bin"/>
- <javacc target="src/relaxngcc/javabody/JavaBodyParser.jj" outputdirectory="src/relaxngcc/javabody" javacchome="lib" static="false"/>
- <javac srcdir="src" destdir="bin" debug="on" optimize="off" classpath="lib">
- <classpath>
- <fileset dir="lib" includes="**/*.jar"/>
- </classpath>
- </javac>
- </target>
-
- <!-- Generate javadoc documentation: -->
- <target name="javadoc" depends="compile">
- <mkdir dir="javadoc"/>
- <javadoc locale="en_US" sourcepath="src" destdir="javadoc" windowtitle="RelaxNGCC" public="yes">
- <package name="relaxngcc.*"/>
- <classpath>
- <fileset dir="lib" includes="*.jar"/>
- </classpath>
- </javadoc>
- </target>
-
- <!-- Create the jar file: -->
- <target name="jar" depends="compile">
- <tstamp/>
- <jar jarfile="relaxngcc.jar">
- <manifest>
- <attribute name="Version" value="${DSTAMP}"/>
- <attribute name="Main-Class" value="relaxngcc.RelaxNGCC"/>
- </manifest>
- <fileset dir="src" includes="**/*.properties"/>
- <fileset dir="src" includes="**/*.xsl"/>
- <fileset dir="src" includes="**/*.jelly"/>
- <fileset dir="src" includes="relaxngcc/runtime/*.java"/>
- <fileset dir="bin" includes="**/*.class"/>
- <fileset dir="." includes="project.xml"/>
- </jar>
- </target>
-
-</project>
+<project name="RELAXNGCC" basedir="." default="jar">
+
+ <taskdef name="relaxngcc" classname="relaxngcc.ant.RelaxNGCCTask">
+ <classpath path="lib/bootstrap-relaxngcc.jar"/>
+ </taskdef>
+
+ <!-- use bootstrap RelaxNGCC to compile the parser -->
+ <target name="ngcc">
+
+ <mkdir dir="src/relaxngcc/parser/automata"/>
+
+ <relaxngcc source="src/relaxngcc/parser/relaxng.rng"
+ targetdir="src/relaxngcc/parser/state"
+ automata="src/relaxngcc/parser/automata">
+
+ <!-- up-to-date check parameters -->
+ <depends dir="src/relaxngcc/parser" includes="relaxng.rng"/>
+ <produces dir="src/relaxngcc/parser/automata" includes="*.gif"/>
+ <produces dir="src/relaxngcc/parser/state" includes="*.java"/>
+ </relaxngcc>
+
+ <mkdir dir="src/relaxngcc/datatype/parser" />
+
+ <relaxngcc source="src/relaxngcc/datatype/datatype.rng"
+ targetdir="src/relaxngcc/datatype/parser">
+
+ <!-- up-to-date check parameters -->
+ <depends dir="src/relaxngcc/datatype" includes="datatype.rng"/>
+ <produces dir="src/relaxngcc/datatype/parser" includes="*.java"/>
+ </relaxngcc>
+ </target>
+
+ <!-- compile Java source files -->
+ <target name="compile" depends="ngcc">
+ <mkdir dir="bin"/>
+ <javacc target="src/relaxngcc/javabody/JavaBodyParser.jj"
+ outputdirectory="src/relaxngcc/javabody"
+ javacchome="/usr/share/java"
+ static="false"/>
+ <javac
+ srcdir="src"
+ destdir="bin"
+ debug="on"
+ optimize="off"
+ classpath="bin">
+
+ <classpath>
+ <fileset dir="/usr/share/java" includes="msv-msv.jar"/>
+ <fileset dir="/usr/share/java" includes="msv-xsdlib.jar"/>
+ <fileset dir="/usr/share/java" includes="relaxngDatatype.jar"/>
+ <fileset dir="/usr/share/java" includes="xerces-j2.jar"/>
+ <fileset dir="/usr/share/java" includes="javacc.jar"/>
+ <!--fileset dir="/usr/share/java" includes="common-jelly.jar"/-->
+ <fileset dir="/usr/share/java" includes="relaxngcc.jar"/>
+ <fileset dir="lib" includes="bootstrap-relaxngcc.jar"/>
+ </classpath>
+ </javac>
+ </target>
+
+ <!-- generate javadoc documentation from the working copy -->
+ <target name="javadoc" depends="compile">
+ <mkdir dir="javadoc"/>
+ <javadoc locale="en_US"
+ sourcepath="src"
+ destdir="javadoc"
+ windowtitle="RelaxNGCC"
+ public="yes"
+ >
+
+ <package name="relaxngcc.*"/>
+ <classpath>
+ <fileset dir="/usr/share/java" includes="msv-msv.jar"/>
+ <fileset dir="/usr/share/java" includes="msv-xsdlib.jar"/>
+ <fileset dir="/usr/share/java" includes="relaxngDatatype.jar"/>
+ <fileset dir="/usr/share/java" includes="xerces-j2.jar"/>
+ <!--fileset dir="/usr/share/java" includes="common-jelly.jar"/-->
+ <fileset dir="/usr/share/java" includes="relaxngcc.jar"/>
+ <fileset dir="lib" includes="bootstrap-relaxngcc.jar"/>
+ </classpath>
+ </javadoc>
+ </target>
+
+ <!-- document generation -->
+ <target name="doc">
+ <javac srcdir="docgen" destdir="docgen" />
+
+ <mkdir dir="htdocs/en"/>
+ <mkdir dir="htdocs/ja"/>
+ <copy todir="htdocs/ja">
+ <fileset dir="htdocs">
+ <include name="*.*"/>
+ </fileset>
+ </copy>
+ <copy todir="htdocs/en">
+ <fileset dir="htdocs">
+ <include name="*.*"/>
+ </fileset>
+ </copy>
+
+ <taskdef name="docgen" classname="DocGenTask">
+ <classpath>
+ <pathelement path="docgen"/>
+ </classpath>
+ </taskdef>
+
+ <docgen language="ja">
+ <src dir="htdocs" includes="*.htm"/>
+ </docgen>
+ <docgen language="en">
+ <src dir="htdocs" includes="*.htm"/>
+ </docgen>
+ </target>
+
+ <target name="jar" depends="compile">
+ <tstamp/>
+
+<echo file="bin/METAINF.MF"
+>Version: ${DSTAMP}
+Main-Class: relaxngcc.RelaxNGCC
+Class-Path: relaxngDatatype.jar msv-xsdlib.jar msv-msv.jar xml-commons-apis.jar xerces-j2.jar
+</echo>
+ <jar jarfile="relaxngcc.jar" compress="false" manifest="bin/METAINF.MF">
+ <fileset dir="src" includes="**/*.properties"/>
+ <fileset dir="src" includes="**/*.xsl"/>
+ <!--fileset dir="src" includes="**/*.jelly"/-->
+ <fileset dir="src" includes="relaxngcc/runtime/*.java"/>
+ <fileset dir="bin" includes="**/*.class"/>
+ <fileset dir="." includes="project.xml"/>
+ </jar>
+ <delete file="bin/METAINF.MF"/>
+ </target>
+
+ <!-- create a distribution package -->
+ <target name="release" depends="jar,javadoc,doc">
+ <tstamp />
+ <property name="stage" value="relaxngcc-${DSTAMP}"/>
+
+ <!-- creates distribution package -->
+ <mkdir dir="package" />
+ <zip zipfile="package/${stage}.zip">
+ <zipfileset dir="." includes="relaxngcc.jar" fullpath="${stage}/relaxngcc.jar" />
+ <zipfileset dir="src" includes="**/*.*" prefix="${stage}/src" />
+ <zipfileset dir="sample" includes="**/*.*" prefix="${stage}/sample" />
+ <zipfileset dir="htdocs" includes="ja/*.*,en/*.*" prefix="${stage}/doc">
+ <exclude name="**/.cvsignore"/>
+ </zipfileset>
+ <zipfileset dir="doc" includes="**/*.*" prefix="${stage}"/>
+ <zipfileset dir="lib" prefix="${stage}">
+ <!--include name="relaxngDatatype.jar" />
+ <include name="xerces.jar" />
+ <include name="msv.jar" />
+ <include name="xsdlib.jar" /-->
+ </zipfileset>
+ </zip>
+ </target>
+
+
+ <!-- use working copy of RelaxNGCC to compile the parser. useful for test -->
+ <target name="self-ngcc">
+ <taskdef name="self-relaxngcc" classname="relaxngcc.ant.RelaxNGCCTask">
+ <classpath path="bin"/>
+ <classpath path="src"/>
+ <classpath path="./lib/bootstrap-relaxngcc.jar:/usr/share/java/relaxngDatatype.jar"/>
+ </taskdef>
+
+ <mkdir dir="src/relaxngcc/parser/automata"/>
+ <delete dir="src/relaxngcc/parser/automata" includes="*.gif" />
+ <delete dir="src/relaxngcc/parser/state" includes="*.java" />
+
+ <self-relaxngcc source="src/relaxngcc/parser/relaxng.rng"
+ targetdir="src/relaxngcc/parser/state"
+ automata="src/relaxngcc/parser/automata">
+ </self-relaxngcc>
+
+
+ <mkdir dir="src/relaxngcc/datatype/parser" />
+
+ <self-relaxngcc source="src/relaxngcc/datatype/datatype.rng"
+ targetdir="src/relaxngcc/datatype/parser" />
+ </target>
+
+
+ <target name="clean">
+ <delete dir="javadoc"/>
+ <delete dir="bin"/>
+ <delete dir="src/relaxngcc/parser/state" includes="*.java" />
+ <delete dir="src/relaxngcc/parser/automata" includes="*.gif" />
+ <delete dir="testCases" includes="**/*.java, **/*.class, **/*.gif"/>
+ </target>
+</project>
\ No newline at end of file
diff --git a/relaxngcc.spec b/relaxngcc.spec
index 24181b2..3a15012 100644
--- a/relaxngcc.spec
+++ b/relaxngcc.spec
@@ -1,129 +1,143 @@
-Name: relaxngcc
-Version: 1.12
-Release: 3%{?dist}
-Summary: RELAX NG Compiler Compiler
-Group: Development/Libraries
-
-License: ASL 1.1
-
-Url: http://relaxngcc.sourceforge.net/en/index.htm
-
-Source0: http://prdownloads.sourceforge.net/relaxngcc/relaxngcc-20031218.zip
-Source1: %{name}-build.xml
+%define with_bootstrap 1
+%define src_date 20031218
+
+Name: relaxngcc
+Version: 1.12
+Release: 2%{?dist}
+Summary: RELAX NG Compiler Compiler
+Group: Development/Libraries
+License: ASL 1.1
+Url: http://relaxngcc.sourceforge.net/en/index.htm
+Source0: http://prdownloads.sourceforge.net/relaxngcc/relaxngcc-%{src_date}.zip
+Source1: relaxngcc-build.xml
+
+BuildRequires: java-devel >= 1:1.6.0
+BuildRequires: jpackage-utils
+BuildRequires: dos2unix
BuildRequires: ant
+BuildRequires: graphviz
BuildRequires: javacc
-BuildRequires: jpackage-utils
BuildRequires: msv-msv
BuildRequires: msv-xsdlib
BuildRequires: relaxngDatatype
BuildRequires: xerces-j2
BuildRequires: xml-commons-apis
-BuildRequires: dos2unix
-
-Requires: msv-msv
-Requires: msv-xsdlib
-Requires: relaxngDatatype
-Requires: xerces-j2
-Requires: xml-commons-apis
-
-BuildArch: noarch
-
+%if !%with_bootstrap
+BuildRequires: %{name} = %{version}
+%endif
+
+Requires: ant
+Requires: msv-msv
+Requires: msv-xsdlib
+Requires: relaxngDatatype
+Requires: xerces-j2
+Requires: xml-commons-apis
+Requires: java >= 1:1.6.0
+Requires: jpackage-utils
+BuildArch: noarch
%description
-RelaxNGCC is a tool for generating Java source code from a given RELAX NG
-grammar. By embedding code fragments in the grammar like yacc or JavaCC, you can
-take appropriate actions while parsing valid XML documents against the grammar.
-
+RelaxNGCC is a tool for generating Java source code from a
+given RELAX NG grammar. By embedding code fragments in the
+grammar like yacc or JavaCC, you can take appropriate
+actions while parsing valid XML documents against the
+grammar.
%package javadoc
-Group: Development/Libraries
-Summary: Javadoc for %{name}
-Requires: jpackage-utils
-
+Group: Documentation
+Summary: Javadoc for %{name}
+Requires: %{name} = %{version}-%{release}
+Requires: jpackage-utils
%description javadoc
+RELAX NG Compiler Compiler.
+
This package contains javadoc for %{name}.
+%package manual
+Group: Documentation
+Summary: Documents for %{name}
-%prep
+%description manual
+RELAX NG Compiler Compiler.
-# Prepare the original sources:
-%setup -q -n relaxngcc-20031218
+This package contains documents for %{name}.
-# Remove all the binary files:
-find . -name '*.class' -delete
-find . -name '*.jar' -delete
+%prep
+%setup -q -n %{name}-%{src_date}
-# Remove the sources that will be generated with JavaCC:
-rm src/relaxngcc/javabody/*.java
+cp %{SOURCE1} build.xml
-# Remove to avoid dependency on commons-jelly:
-rm src/relaxngcc/maven/ChildAntProjectTag.java
+find -name '*.class' -exec rm -f '{}' \;
-# Some of the sources don't use the correct end of line encoding, so to be
-# conservative fix all of them:
+mkdir lib
+%if %with_bootstrap
+ find -name '*.jar' ! -iname "%{name}.jar" -exec rm -f '{}' \;
+ mv %{name}.jar lib/bootstrap-%{name}.jar
+%else
+ find -name '*.jar' -exec rm -f '{}' \;
+ ln -sf $(build-classpath relaxngcc) bootstrap-relaxngcc.jar
+%endif
+
+# javacc regenerated source code
+rm -rf src/relaxngcc/javabody/ParseException.java
+rm -rf src/relaxngcc/javabody/SimpleCharStream.java
+rm -rf src/relaxngcc/javabody/Token.java
+rm -rf src/relaxngcc/javabody/TokenMgrError.java
+rm -rf src/relaxngcc/javabody/JavaBodyParser.java
+
+# require common-jelly in classpath
+rm -rf src/relaxngcc/maven/ChildAntProjectTag.java
+
+# fix the correct end of line encoding
find . -type f -exec dos2unix {} \;
-# Some of the source files contain characters outside of the ASCII set that
-# cause problems when compiling, so make sure that they are translated to
-# ASCCI:
-sources='
-src/relaxngcc/builder/SwitchBlockInfo.java
-'
-for source in ${sources}
-do
- native2ascii -encoding UTF8 ${source} ${source}
-done
+# fix the source files contain characters outside of the ASCII set
+(
+ cd src/relaxngcc/builder
+ native2ascii -encoding UTF8 SwitchBlockInfo.java SwitchBlockInfo.java
+)
+# remove the sources that will be generated with relaxngcc itself
+rm -rf src/relaxngcc/parser/automata/*.gif
+rm -rf src/relaxngcc/parser/state/*.java
%build
-
-# Populate the lib directory with references to the jar files required for the
-# build:
-mkdir lib
-pushd lib
- ln -sf $(build-classpath msv-msv) .
- ln -sf $(build-classpath relaxngDatatype) .
- ln -sf $(build-classpath xerces-j2) .
- ln -sf $(build-classpath msv-xsdlib) .
- ln -sf $(build-classpath javacc) .
-popd
-
-# Put the ant build files in place:
-cp %{SOURCE1} build.xml
-
-# Run the ant build:
-ant jar javadoc
-
+# bootstrap
+ant -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 clean jar
+rm -rf bin/relaxngcc lib/bootstrap-%{name}.jar
+mv %{name}.jar lib/bootstrap-%{name}.jar
+# relaxngcc rebuild itself
+ant -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 clean jar javadoc
%install
-# Jar files:
mkdir -p %{buildroot}%{_javadir}
-install -pm 644 relaxngcc.jar %{buildroot}%{_javadir}/%{name}.jar
+install -pm 644 %{name}.jar %{buildroot}%{_javadir}/%{name}.jar
-# Javadoc files:
mkdir -p %{buildroot}%{_javadocdir}/%{name}
-cp -pr javadoc/* %{buildroot}%{_javadocdir}/%{name}/.
-
+cp -pr javadoc/* %{buildroot}%{_javadocdir}/%{name}
%files
-%{_javadir}/*
+%{_javadir}/%{name}.jar
%doc src/HOWTO-readAutomata.txt LICENSE.txt readme.txt
-%doc doc/*
+%pre javadoc
+[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
+rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%files javadoc
-%{_javadocdir}/*
+%{_javadocdir}/%{name}
%doc LICENSE.txt
-%changelog
-* Tue Feb 14 2012 Juan Hernandez <juan.hernandez(a)redhat.com> 1.12-3
-- Changed license to ASL 1.1
+%files manual
+%doc doc/* LICENSE.txt
-* Tue Feb 14 2012 Juan Hernandez <juan.hernandez(a)redhat.com> 1.12-2
-- Cleanups of the spec file
+%changelog
+* Wed Feb 22 2012 gil cattaneo <puntogil(a)libero.it> 1.12-2
+- fix wrong file end of line encoding
+- fix license field
-* Sat Jan 21 2012 Marek Goldmann <mgoldman(a)redhat.com> 1.12-1
-- Initial packaging
+* Mon Jul 27 2009 gil cattaneo <puntogil(a)libero.it> 1.12-1
+- initial rpm
\ No newline at end of file
12 years, 1 month
[plexus-pom/f17] Initial import.
by gil
Summary of changes:
2878ad8... Initial import. (*)
(*) This commit already existed in another branch; no separate mail sent
12 years, 1 month
[plexus-pom/f16] Initial import.
by gil
Summary of changes:
2878ad8... Initial import. (*)
(*) This commit already existed in another branch; no separate mail sent
12 years, 1 month
[plexus-pom] Initial import.
by gil
commit 2878ad8a416894b34d71f49203bb83d2cf8b5c8e
Author: gil <puntogil(a)libero.it>
Date: Sat Feb 25 00:02:45 2012 +0100
Initial import.
.gitignore | 1 +
plexus-pom-3.0.1-no-site-plugin.patch | 42 ++++++++++++++++++++++
plexus-pom-3.0.1-pom.patch | 32 +++++++++++++++++
plexus-pom.spec | 61 +++++++++++++++++++++++++++++++++
sources | 1 +
5 files changed, 137 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..61e8cd9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/plexus-pom-3.0.1.tar.xz
diff --git a/plexus-pom-3.0.1-no-site-plugin.patch b/plexus-pom-3.0.1-no-site-plugin.patch
new file mode 100644
index 0000000..abbd772
--- /dev/null
+++ b/plexus-pom-3.0.1-no-site-plugin.patch
@@ -0,0 +1,42 @@
+--- pom.xml 2012-02-08 16:07:39.235304020 +0100
++++ pom.xml-gil 2012-02-08 16:17:35.951288824 +0100
+@@ -364,10 +364,10 @@
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.5</version>
+ </plugin>
+- <plugin>
++ <!--plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+- <version>3.0</version>
++ <version>3.0</version-->
+ <!--dependencies>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+@@ -375,7 +375,7 @@
+ <version>1.0</version>
+ </dependency>
+ </dependencies-->
+- </plugin>
++ <!--/plugin-->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+@@ -569,7 +569,7 @@
+ </activation>
+ <build>
+ <plugins>
+- <plugin>
++ <!--plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <executions>
+@@ -580,7 +580,7 @@
+ </goals>
+ </execution>
+ </executions>
+- </plugin>
++ </plugin-->
+ </plugins>
+ </build>
+ </profile>
diff --git a/plexus-pom-3.0.1-pom.patch b/plexus-pom-3.0.1-pom.patch
new file mode 100644
index 0000000..1993af4
--- /dev/null
+++ b/plexus-pom-3.0.1-pom.patch
@@ -0,0 +1,32 @@
+--- pom.xml 2011-08-07 22:04:19.000000000 +0200
++++ pom.xml-gil 2012-02-08 16:02:27.935311947 +0100
+@@ -368,13 +368,13 @@
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>3.0</version>
+- <dependencies>
++ <!--dependencies>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-webdav-jackrabbit</artifactId>
+ <version>1.0</version>
+ </dependency>
+- </dependencies>
++ </dependencies-->
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+@@ -481,11 +481,11 @@
+ </excludeRoots>
+ </configuration>
+ </plugin>
+- <plugin>
++ <!--plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>taglist-maven-plugin</artifactId>
+ <version>2.4</version>
+- </plugin>
++ </plugin-->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
diff --git a/plexus-pom.spec b/plexus-pom.spec
new file mode 100644
index 0000000..237bab3
--- /dev/null
+++ b/plexus-pom.spec
@@ -0,0 +1,61 @@
+Name: plexus-pom
+Version: 3.0.1
+Release: 1%{?dist}
+Summary: Root Plexus Projects pom
+Group: Development/Libraries
+License: ASL 2.0
+URL: https://github.com/sonatype/%{name}/
+# git clone git://github.com/sonatype/plexus-pom.git
+# cd plexus-pom
+# git archive --format=tar --prefix=plexus-pom-3.0.1/ plexus-3.0.1 | xz >plexus-pom-3.0.1.tar.xz
+Source0: plexus-pom-%{version}.tar.xz
+
+# remove
+# org.codehaus.mojo taglist-maven-plugin 2.4
+# org.apache.maven.wagon wagon-webdav-jackrabbit 1.0
+Patch0: plexus-pom-3.0.1-pom.patch
+# remove
+# maven-site-plugin which require org.codehaus.plexus:plexus-stylus-skin 1.0
+Patch1: plexus-pom-3.0.1-no-site-plugin.patch
+
+BuildRequires: java-devel
+BuildRequires: jpackage-utils >= 0:1.7.5
+BuildRequires: spice-parent
+
+BuildRequires: maven
+BuildRequires: maven-install-plugin
+BuildRequires: modello
+BuildRequires: plexus-containers-component-metadata
+
+Requires: maven
+Requires: spice-parent
+
+Requires: jpackage-utils >= 0:1.7.5
+BuildArch: noarch
+
+%description
+The Plexus project provides a full software stack for creating and
+executing software projects.
+
+%prep
+%setup -q
+%patch0 -p0
+%patch1 -p0
+
+%build
+
+mvn-rpmbuild install
+
+%install
+
+mkdir -p %{buildroot}%{_mavenpomdir}
+install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.plexus-plexus.pom
+%add_maven_depmap JPP.plexus-plexus.pom
+
+%files
+%{_mavenpomdir}/JPP.plexus-plexus.pom
+%{_mavendepmapfragdir}/%{name}
+
+%changelog
+* Wed Feb 08 2012 gil cattaneo <puntogil(a)libero.it> 3.0.1-1
+- initial rpm
\ No newline at end of file
diff --git a/sources b/sources
index e69de29..cc7899b 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+75753f24254b405a3a5c0d20e57e56c8 plexus-pom-3.0.1.tar.xz
12 years, 1 month