[httpcomponents-client] Update to upstream version 4.2.3
by Mikolaj Izdebski
commit 19bff7f13e32826c5e8b15ac683ccbf114f23089
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Thu Jan 24 21:47:16 2013 +0100
Update to upstream version 4.2.3
.gitignore | 1 +
httpcomponents-client.spec | 5 ++++-
sources | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d1cdeaa..c14100f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ httpcomponents-client-4.1-src.tar.gz
/httpcomponents-client-4.1.1-src.tar.gz
/httpcomponents-client-4.1.2-src.tar.gz
/httpcomponents-client-4.1.3-src.tar.gz
+/httpcomponents-client-4.2.3-src.tar.gz
diff --git a/httpcomponents-client.spec b/httpcomponents-client.spec
index 571006d..6121895 100644
--- a/httpcomponents-client.spec
+++ b/httpcomponents-client.spec
@@ -2,7 +2,7 @@
Name: httpcomponents-client
Summary: HTTP agent implementation based on httpcomponents HttpCore
-Version: 4.2.2
+Version: 4.2.3
Release: 1%{?dist}
Group: Development/Libraries
License: ASL 2.0
@@ -138,6 +138,9 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
%doc %{_javadocdir}/%{name}
%changelog
+* Thu Jan 24 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 4.2.3-1
+- Update to upstream version 4.2.3
+
* Thu Oct 25 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 4.2.2-1
- Update to upstream version 4.2.2
diff --git a/sources b/sources
index b6233af..f8db9d5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-082c06d4739920f09126d42406591ac8 httpcomponents-client-4.2.2-src.tar.gz
+f2d309ac114b41c281f8e60b4b5817df httpcomponents-client-4.2.3-src.tar.gz
11 years, 4 months
[apache-commons-daemon] Update to upstream version 1.0.12
by Mikolaj Izdebski
commit 1ff21719e1e75fefd2836bdbe2be698988ce541d
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Thu Jan 24 15:56:26 2013 +0100
Update to upstream version 1.0.12
- Install NOTICE files
.gitignore | 1 +
apache-commons-daemon-JAVA_OS.patch | 19 ++++---------------
apache-commons-daemon.spec | 12 ++++++++----
sources | 2 +-
4 files changed, 14 insertions(+), 20 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9cb6bae..9de889a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ commons-daemon-1.0.2-src.tar.gz
/commons-daemon-1.0.8-src.tar.gz
/commons-daemon-1.0.10-src.tar.gz
/commons-daemon-1.0.11-src.tar.gz
+/commons-daemon-1.0.12-src.tar.gz
diff --git a/apache-commons-daemon-JAVA_OS.patch b/apache-commons-daemon-JAVA_OS.patch
index 43280a6..b67b56e 100644
--- a/apache-commons-daemon-JAVA_OS.patch
+++ b/apache-commons-daemon-JAVA_OS.patch
@@ -1,7 +1,7 @@
---- commons-daemon-1.0.11-src/src/native/unix/configure~ 2012-12-11 15:55:48.300816506 +0100
-+++ commons-daemon-1.0.11-src/src/native/unix/configure 2012-12-11 15:56:20.153550277 +0100
-@@ -3391,7 +3391,7 @@
- $as_echo "jni_md.h found in $JAVA_HOME/$JAVA_INC" >&6; }
+--- commons-daemon-1.0.12-src/src/native/unix/configure~ 2013-01-14 07:45:15.000000000 +0100
++++ commons-daemon-1.0.12-src/src/native/unix/configure 2013-01-24 15:55:59.757193071 +0100
+@@ -2776,7 +2776,7 @@
+ echo "${ECHO_T}jni_md.h found in $JAVA_HOME/$JAVA_INC" >&6
INCLUDES="$INCLUDES -I$JAVA_HOME/include -I$JAVA_HOME/$JAVA_INC"
else
- INCLUDES="$INCLUDES -I$JAVA_HOME/include -I$JAVA_HOME/include/$supported_os"
@@ -9,14 +9,3 @@
fi
if test "$GCC" = "yes"
---- commons-daemon-1.0.11-src/src/native/unix/configure.in~ 2012-11-22 13:37:28.000000000 +0100
-+++ commons-daemon-1.0.11-src/src/native/unix/configure.in 2012-12-11 15:57:01.004206412 +0100
-@@ -98,7 +98,7 @@
- AC_MSG_RESULT([jni_md.h found in $JAVA_HOME/$JAVA_INC])
- INCLUDES="$INCLUDES -I$JAVA_HOME/include -I$JAVA_HOME/$JAVA_INC"
- else
-- INCLUDES="$INCLUDES -I$JAVA_HOME/include -I$JAVA_HOME/include/$supported_os"
-+ INCLUDES="$INCLUDES -I$JAVA_HOME/include -I$JAVA_HOME/include/$JAVA_OS"
- fi
-
- dnl -------------------------------------------------------------------------
diff --git a/apache-commons-daemon.spec b/apache-commons-daemon.spec
index 205804f..ec74e8d 100644
--- a/apache-commons-daemon.spec
+++ b/apache-commons-daemon.spec
@@ -3,8 +3,8 @@
%global short_name commons-%{base_name}
Name: apache-%{short_name}
-Version: 1.0.11
-Release: 2%{?dist}
+Version: 1.0.12
+Release: 1%{?dist}
Summary: Defines API to support an alternative invocation mechanism
License: ASL 2.0
Group: Applications/System
@@ -103,16 +103,20 @@ install -Dpm 644 src/native/unix/jsvc.1 $RPM_BUILD_ROOT%{_mandir}/man1/jsvc.1
%files jsvc
-%doc LICENSE.txt
+%doc LICENSE.txt NOTICE.txt
%{_bindir}/jsvc
%{_mandir}/man1/jsvc.1*
%files javadoc -f .mfiles-javadoc
-%doc LICENSE.txt
+%doc LICENSE.txt NOTICE.txt
%changelog
+* Thu Jan 24 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1.0.12-1
+- Update to upstream version 1.0.12
+- Install NOTICE files
+
* Tue Jan 15 2013 Michal Srb <msrb(a)redhat.com> - 1.0.11-2
- Build with xmvn
- Spec file cleanup
diff --git a/sources b/sources
index f946e65..1bf05f2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-add541d9cdc099a18d11eecb1e0e33d6 commons-daemon-1.0.11-src.tar.gz
+453b325951fb2527825b3fba35f48973 commons-daemon-1.0.12-src.tar.gz
11 years, 4 months
[maven-compiler-plugin/update-to-version-3.x] Update to upstream version 3.0
by Mikolaj Izdebski
commit bcc1f05f8be8eac3ecb4786509e736b008a36504
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Wed Jan 23 16:17:03 2013 +0100
Update to upstream version 3.0
- Build with xmvn
- Install license files, resolves: rhbz#895544
.gitignore | 1 +
maven-compiler-plugin.spec | 71 +++++++++++++------------------------------
sources | 2 +-
3 files changed, 24 insertions(+), 50 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 40dc02f..adebbfd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ maven-compiler-plugin-2.0.2.tar.xz
/maven-compiler-plugin-2.3.2.tar.xz
/maven-compiler-plugin-2.4.tar.xz
/maven-compiler-plugin-2.5.1-source-release.zip
+/maven-compiler-plugin-3.0-source-release.zip
diff --git a/maven-compiler-plugin.spec b/maven-compiler-plugin.spec
index b8087ba..10ff67e 100644
--- a/maven-compiler-plugin.spec
+++ b/maven-compiler-plugin.spec
@@ -1,6 +1,6 @@
Name: maven-compiler-plugin
-Version: 2.5.1
-Release: 2%{?dist}
+Version: 3.0
+Release: 1%{?dist}
Summary: Maven Compiler Plugin
Group: Development/Libraries
@@ -10,28 +10,15 @@ Source0: http://repo1.maven.org/maven2/org/apache/maven/plugins/%{name}/%
BuildArch: noarch
-BuildRequires: java-devel >= 1:1.6.0
-BuildRequires: maven
-BuildRequires: maven-plugin-plugin
-BuildRequires: maven-compiler-plugin
-BuildRequires: maven-jar-plugin
-BuildRequires: maven-install-plugin
-BuildRequires: maven-resources-plugin
-BuildRequires: maven-javadoc-plugin
-BuildRequires: maven-surefire-plugin
-BuildRequires: maven-surefire-provider-junit
-BuildRequires: maven-doxia-sitetools
-BuildRequires: maven-plugin-testing-harness
-BuildRequires: maven-toolchain
-BuildRequires: plexus-utils
-BuildRequires: plexus-compiler
-
-Requires: maven
-Requires: maven-toolchain
-Requires: plexus-utils
-Requires: plexus-compiler
-Requires: jpackage-utils
-Requires: java
+BuildRequires: java-devel >= 1:1.6.0
+BuildRequires: xmvn >= 0.2.4
+BuildRequires: maven-plugin-plugin
+BuildRequires: maven-shared-incremental
+BuildRequires: maven-surefire-provider-junit
+BuildRequires: maven-doxia-sitetools
+BuildRequires: maven-plugin-testing-harness
+BuildRequires: maven-toolchain
+BuildRequires: plexus-compiler >= 2.0
Provides: maven2-plugin-compiler = %{version}-%{release}
Obsoletes: maven2-plugin-compiler <= 0:2.0.8
@@ -42,45 +29,31 @@ The Compiler Plugin is used to compile the sources of your project.
%package javadoc
Group: Documentation
Summary: Javadoc for %{name}
-Requires: jpackage-utils
%description javadoc
API documentation for %{name}.
-
%prep
%setup -q
%build
-mvn-rpmbuild install javadoc:aggregate -Dmaven.test.failure.ignore
+%mvn_build -f
%install
+%mvn_install
-# jars
-install -d -m 0755 %{buildroot}%{_javadir}
-install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
-
-# poms
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml \
- %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-
-
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
+%files -f .mfiles
+%doc LICENSE NOTICE
-# javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
-
-%files
-%{_javadir}/*
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
-
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
+%doc LICENSE NOTICE
%changelog
+* Tue Jan 15 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 3.0-1
+- Update to upstream version 3.0
+- Build with xmvn
+- Install license files, resolves: rhbz#895544
+
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.5.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
diff --git a/sources b/sources
index 9bacdc0..f53fb28 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-586235ad82136608c9a7ee7d9d994e9f maven-compiler-plugin-2.5.1-source-release.zip
+d7236609116c82bd6071a05f962ebd46 maven-compiler-plugin-3.0-source-release.zip
11 years, 4 months
[plexus-compiler/update-to-version-2.x] Update to upstream version 2.1
by Mikolaj Izdebski
commit 964139d799696b1a78a72c3b59a96f6c66e6b217
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Wed Jan 23 16:40:37 2013 +0100
Update to upstream version 2.1
- Build with xmvn
.gitignore | 1 +
plexus-compiler-ignoreOptionalProblems.patch | 18 ----
plexus-compiler.spec | 108 +++++--------------------
sources | 2 +-
4 files changed, 24 insertions(+), 105 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1978db1..bd58cd8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ plexus-compiler-1.5.2.tar.gz
/sonatype-plexus-components-plexus-compiler-1.8-0-g7ca7d76.tar.gz
sonatype-plexus-compiler-plexus-compiler-1.8.3-0-gef6142f.tar.gz
/sonatype-plexus-compiler-plexus-compiler-1.9.1-0-g233d1ab.tar.gz
+/plexus-compiler-2.1.tar.gz
diff --git a/plexus-compiler.spec b/plexus-compiler.spec
index eee0e2b..1f29f03 100644
--- a/plexus-compiler.spec
+++ b/plexus-compiler.spec
@@ -29,11 +29,11 @@
#
%global parent plexus
-%global dirhash 56a0f9b
+%global dirhash 16e340d
Name: plexus-compiler
-Version: 1.9.2
-Release: 3%{?dist}
+Version: 2.1
+Release: 1%{?dist}
Epoch: 0
Summary: Compiler call initiators for Plexus
# extras subpackage has a bit different licensing
@@ -44,8 +44,6 @@ URL: http://plexus.codehaus.org/
Source0: https://github.com/sonatype/%{name}/tarball/%{name}-%{version}#/%{name}-%...
-Patch0: plexus-compiler-ignoreOptionalProblems.patch
-
BuildArch: noarch
BuildRequires: maven
BuildRequires: jpackage-utils
@@ -58,11 +56,6 @@ BuildRequires: plexus-containers-component-metadata
BuildRequires: junit4
BuildRequires: plexus-pom
-Requires: classworlds
-Requires: plexus-containers-container-default
-Requires: plexus-utils
-Requires: junit4
-
%description
Plexus Compiler adds support for using various compilers from a
unified api. Support for javac is available in main package. For
@@ -70,29 +63,29 @@ additional compilers see %{name}-extras package.
%package extras
Summary: Extra compiler support for %{name}
-Group: Development/Libraries
# ASL 2.0: src/main/java/org/codehaus/plexus/compiler/util/scan/
# ...codehaus/plexus/compiler/csharp/CSharpCompiler.java
# ASL 1.1/MIT: ...codehaus/plexus/compiler/jikes/JikesCompiler.java
License: MIT and ASL 2.0 and ASL 1.1
-Requires: jpackage-utils
-Requires: eclipse-ecj
-Requires: %{name} = %{version}-%{release}
%description extras
Additional support for csharp, eclipse and jikes compilers
+%package pom
+Summary: Maven POM files for %{name}
+
+%description pom
+This package provides %{summary}.
+
%package javadoc
Summary: Javadoc for %{name}
Group: Documentation
-Requires: jpackage-utils
%description javadoc
API documentation for %{name}.
%prep
%setup -q -n sonatype-plexus-compiler-%{dirhash}
-%patch0 -p1
%pom_disable_module plexus-compiler-aspectj plexus-compilers/pom.xml
@@ -100,83 +93,26 @@ API documentation for %{name}.
%pom_disable_module plexus-compiler-test
%build
-mvn-rpmbuild -e \
- -Dmaven.test.skip=true \
- install javadoc:aggregate
-
+%mvn_package ":plexus-compiler{,s}" pom
+%mvn_package ":*{csharp,eclipse,jikes}*" extras
+# Tests are skipped because of unavailable plexus-compiler-test artifact
+%mvn_build -f
%install
-# jars
-install -d -m 755 %{buildroot}%{_javadir}/%{parent}
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-
-for mod in plexus-compiler-{api,manager}; do
- jarname=${mod/plexus-}
- install -pm 644 $mod/target/${mod}-%{version}.jar \
- %{buildroot}%{_javadir}/%{parent}/$jarname.jar
-
- install -pm 644 $mod/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{parent}-$jarname.pom
- %add_maven_depmap JPP.%{parent}-$jarname.pom %{parent}/$jarname.jar
-done
-
-pushd plexus-compilers
-for mod in plexus-compiler-{csharp,eclipse,jikes,javac}; do
- jarname=${mod/plexus-}
- install -pm 644 $mod/target/${mod}-%{version}.jar \
- %{buildroot}%{_javadir}/%{parent}/$jarname.jar
-
- install -pm 644 $mod/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{parent}-$jarname.pom
- %add_maven_depmap JPP.%{parent}-$jarname.pom %{parent}/$jarname.jar -f extras
-done
-
-install -pm 644 plexus-compiler-javac/target/plexus-compiler-javac-%{version}.jar \
- %{buildroot}%{_javadir}/%{parent}/compiler-javac.jar
-
-install -pm 644 plexus-compiler-javac/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{parent}-compiler-javac.pom
-%add_maven_depmap JPP.%{parent}-compiler-javac.pom %{parent}/compiler-javac.jar
-
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{parent}-compilers.pom
-%add_maven_depmap JPP.%{parent}-compilers.pom
-popd
-
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{parent}-compiler.pom
-%add_maven_depmap JPP.%{parent}-compiler.pom
-
-
-# javadocs
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-%pre javadoc
-# workaround for rpm bug, can be removed in F-17
-[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
-rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
-
-
-%files
-%{_javadir}/%{parent}/compiler-api.jar
-%{_javadir}/%{parent}/compiler-manager.jar
-%{_javadir}/%{parent}/compiler-javac.jar
-%{_mavenpomdir}/JPP.%{parent}-compilers.pom
-%{_mavenpomdir}/JPP.%{parent}-compiler.pom
-%{_mavenpomdir}/JPP.%{parent}-compiler-api.pom
-%{_mavenpomdir}/JPP.%{parent}-compiler-manager.pom
-%{_mavenpomdir}/JPP.%{parent}-compiler-javac.pom
-%{_mavendepmapfragdir}/%{name}
-
-%files extras
-%{_mavendepmapfragdir}/%{name}-extras
-%{_javadir}/%{parent}/compiler-csharp.jar
-%{_javadir}/%{parent}/compiler-eclipse.jar
-%{_javadir}/%{parent}/compiler-jikes.jar
-%{_mavenpomdir}/JPP.%{parent}-compiler-jikes.pom
-%{_mavenpomdir}/JPP.%{parent}-compiler-eclipse.pom
-%{_mavenpomdir}/JPP.%{parent}-compiler-csharp.pom
+%mvn_install
+
+%files -f .mfiles
+%files extras -f .mfiles-extras
+%files pom -f .mfiles-pom
%files javadoc
%doc %{_javadocdir}/%{name}
%changelog
+* Wed Jan 23 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0:2.1-1
+- Update to upstream version 2.1
+- Build with xmvn
+
* Wed Dec 5 2012 Michal Srb <msrb(a)redhat.com> - 0:1.9.2-3
- Replaced dependency to plexus-container-default with plexus-containers-container-default
diff --git a/sources b/sources
index 2be2e4b..21ec3cf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-623e888e90e834c2e57d943732bc2453 plexus-compiler-1.9.2.tar.gz
+b5a2e177eda83ad4b70488f6d4b93a3b plexus-compiler-2.1.tar.gz
11 years, 4 months