[mojo-parent] Update to upstream version 34
by Mikolaj Izdebski
commit c936787adcf7ce05d5347bd6962165f78571f332
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Mon Oct 13 08:48:24 2014 +0200
Update to upstream version 34
.gitignore | 1 +
mojo-parent.spec | 7 +++++--
sources | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6a99c06..6f8d7df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ mojo-parent-29-source-release.zip
/mojo-parent-32-source-release.zip
/LICENSE-2.0.txt
/mojo-parent-33-source-release.zip
+/mojo-parent-34-source-release.zip
diff --git a/mojo-parent.spec b/mojo-parent.spec
index 762b66e..5ebb94e 100644
--- a/mojo-parent.spec
+++ b/mojo-parent.spec
@@ -1,6 +1,6 @@
Name: mojo-parent
-Version: 33
-Release: 4%{?dist}
+Version: 34
+Release: 1%{?dist}
Summary: Codehaus MOJO parent project pom file
License: ASL 2.0
@@ -36,6 +36,9 @@ cp %SOURCE1 .
%doc LICENSE-2.0.txt
%changelog
+* Mon Oct 13 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 34-1
+- Update to upstream version 34
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 33-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
diff --git a/sources b/sources
index 5c6115d..a533307 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-a145e88a9cf25fa211423be84480bc80 mojo-parent-33-source-release.zip
+4375d3bf0d1d1dd4f20d8b45c78162e8 mojo-parent-34-source-release.zip
3b83ef96387f14655fc854ddc3c6bd57 LICENSE-2.0.txt
9 years, 7 months
[checkstyle] Update to upstream version 5.8
by Mikolaj Izdebski
commit 361f2da6f8e94d9f340816dba2e59c1f04e5803d
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Mon Oct 13 08:42:30 2014 +0200
Update to upstream version 5.8
.gitignore | 1 +
checkstyle.spec | 13 ++++++++-----
sources | 2 +-
3 files changed, 10 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index cc633ac..8fc9621 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ checkstyle-src-5.1.tar.gz
checkstyle-5.5-src.tar.gz
/checkstyle-5.6-src.tar.gz
/checkstyle-5.7-src.tar.gz
+/checkstyle-5.8-src.tar.gz
diff --git a/checkstyle.spec b/checkstyle.spec
index 6c34906..06f6d79 100644
--- a/checkstyle.spec
+++ b/checkstyle.spec
@@ -29,8 +29,8 @@
#
Name: checkstyle
-Version: 5.7
-Release: 3%{?dist}
+Version: 5.8
+Release: 1%{?dist}
Summary: Java source code checker
URL: http://checkstyle.sourceforge.net/
# src/checkstyle/com/puppycrawl/tools/checkstyle/grammars/java.g is GPLv2+
@@ -103,7 +103,7 @@ sed -i s/guava-jdk5/guava/ pom.xml
%pom_add_dep com.sun:tools
# fix encoding issues in docs
-sed -i 's/\r//' LICENSE LICENSE.apache20 README.textile RIGHTS.antlr \
+sed -i 's/\r//' LICENSE LICENSE.apache20 README.md RIGHTS.antlr \
checkstyle_checks.xml sun_checks.xml suppressions.xml \
contrib/hooks/*.pl src/site/resources/css/*css \
java.header
@@ -124,7 +124,7 @@ rm -f src/tests/com/puppycrawl/tools/checkstyle/filters/SuppressionsLoaderTest.j
# dtds
install -Dm 644 %{SOURCE2} %{buildroot}%{_datadir}/xml/%{name}/catalog
-cp -pa src/checkstyle/com/puppycrawl/tools/checkstyle/*.dtd \
+cp -pa src/main/resources/com/puppycrawl/tools/checkstyle/*.dtd \
%{buildroot}%{_datadir}/xml/%{name}
# javadoc
@@ -158,7 +158,7 @@ if [ -x %{_bindir}/install-catalog -a -d %{_sysconfdir}/sgml ]; then
fi
%files -f .mfiles
-%doc LICENSE README.textile
+%doc LICENSE README.md
%doc checkstyle_checks.xml java.header sun_checks.xml suppressions.xml
%{_datadir}/xml/%{name}
%{_bindir}/%{name}
@@ -172,6 +172,9 @@ fi
%changelog
+* Mon Oct 13 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 5.8-1
+- Update to upstream version 5.8
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 5.7-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
diff --git a/sources b/sources
index b9d9d9f..b87a367 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-076314bd9bf08812b1f0ff0af913dee9 checkstyle-5.7-src.tar.gz
+b3112b6cf76a2542d9a37f207e826a7c checkstyle-5.8-src.tar.gz
9 years, 7 months
[beust-jcommander] Update to upstream version 1.45
by Mikolaj Izdebski
commit 2d65363f51d8a47dbb8ad5d2f929d9b4b9bb9bac
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Mon Oct 13 08:39:32 2014 +0200
Update to upstream version 1.45
.gitignore | 1 +
beust-jcommander.spec | 7 +++++--
sources | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 80da2e8..3bc4e55 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/beust-jcommander-1.17.tar.xz
/jcommander-1.30.tar.gz
/jcommander-1.35.tar.gz
+/jcommander-1.45.tar.gz
diff --git a/beust-jcommander.spec b/beust-jcommander.spec
index 070ba53..ba681e8 100644
--- a/beust-jcommander.spec
+++ b/beust-jcommander.spec
@@ -1,8 +1,8 @@
%global short_name jcommander
Name: beust-%{short_name}
-Version: 1.35
-Release: 2%{?dist}
+Version: 1.45
+Release: 1%{?dist}
Summary: Java framework for parsing command line parameters
License: ASL 2.0
Group: Development/Libraries
@@ -41,6 +41,9 @@ chmod -x license.txt
%doc license.txt notice.md
%changelog
+* Mon Oct 13 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1.45-1
+- Update to upstream version 1.45
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.35-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
diff --git a/sources b/sources
index 98d74e5..dfa114f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-228e484769fdb89e0c2f3e9bb8961fe2 jcommander-1.35.tar.gz
+51662165ffa00c3e2337fa5ee5ee729a jcommander-1.45.tar.gz
9 years, 7 months
[xmvn/jenkins: 2/2] Fix FTBFS caused by new wersion of plexus-archiver
by Mikolaj Izdebski
commit f2f80540a941541e0230cbb37403177c4baace8b
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Mon Oct 13 08:22:45 2014 +0200
Fix FTBFS caused by new wersion of plexus-archiver
xmvn.spec | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/xmvn.spec b/xmvn.spec
index b987d38..1fe10f6 100644
--- a/xmvn.spec
+++ b/xmvn.spec
@@ -4,7 +4,7 @@
Name: xmvn
Version: 2.1.0
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Local Extensions for Apache Maven
License: ASL 2.0
URL: http://mizdebsk.fedorapeople.org/xmvn
@@ -159,7 +159,7 @@ This package provides %{summary}.
mver=$(sed -n '/<mavenVersion>/{s/.*>\(.*\)<.*/\1/;p}' \
xmvn-parent/pom.xml)
mkdir -p target/dependency/
-ln -s %{_datadir}/maven target/dependency/apache-maven-$mver
+cp -aL %{_datadir}/maven target/dependency/apache-maven-$mver
# skip ITs for now (mix of old & new XMvn config causes issues)
rm -rf src/it
@@ -211,7 +211,9 @@ exec mvn "\${@}"
EOF
# make sure our conf is identical to maven so yum won't freak out
+install -d -m 755 %{buildroot}%{_datadir}/%{name}/conf/
cp -P %{_datadir}/maven/conf/settings.xml %{buildroot}%{_datadir}/%{name}/conf/
+cp -P %{_datadir}/maven/bin/m2.conf %{buildroot}%{_datadir}/%{name}/bin/
%pretrans -p <lua>
-- we changed symlink to dir in 0.5.0-1, workaround RPM issues
@@ -292,6 +294,9 @@ end
%doc LICENSE NOTICE
%changelog
+* Mon Oct 13 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 2.1.0-4
+- Fix FTBFS caused by new wersion of plexus-archiver
+
* Wed Sep 24 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 2.1.0-3
- Fix installation of attached Eclipse artifacts
9 years, 7 months