[Bug 787376] New: junit has a conflicts issue
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: junit has a conflicts issue
https://bugzilla.redhat.com/show_bug.cgi?id=787376
Summary: junit has a conflicts issue
Product: Fedora
Version: rawhide
Platform: Unspecified
OS/Version: Unspecified
Status: NEW
Severity: unspecified
Priority: unspecified
Component: junit
AssignedTo: sochotni(a)redhat.com
ReportedBy: bruno(a)wolff.to
QAContact: extras-qa(a)fedoraproject.org
CC: sochotni(a)redhat.com,
java-sig-commits(a)lists.fedoraproject.org
Classification: Fedora
Story Points: ---
Type: ---
Regression: ---
Mount Type: ---
Documentation: ---
Description of problem:
Yum is reporting:
** Found 1 pre-existing rpmdb problem(s), 'yum check' output follows:
junit-4.10-3.fc17.noarch has installed conflicts junit4:
junit-4.10-3.fc17.noarch
Perhaps the conflicts definition needs to be versioned since junit provides
junit4?
Version-Release number of selected component (if applicable):
How reproducible:
Steps to Reproduce:
1.
2.
3.
Actual results:
Expected results:
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, 3 months
[javapackages] Add separate license file
by Stanislav Ochotnicky
commit 1f0a9276dcf27a2ff9fd8f1ce9ecb45bb895eb15
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Wed Feb 15 14:50:56 2012 +0100
Add separate license file
LICENSE | 26 ++++++++++++++++++++++++++
1 files changed, 26 insertions(+), 0 deletions(-)
---
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..0202ab2
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,26 @@
+Copyright (c) 2011-2012, Red Hat, Inc
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation
+and/or other materials provided with the distribution.
+* Neither the name of the <ORGANIZATION> nor the names of its contributors
+may be used to endorse or promote products derived from this software
+without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ''AS IS'' AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
12 years, 3 months
[javapackages] Enable osgi requires generation by default.
by Alexander Kurtakov
commit aca4690aee6cd17cc35254d61ca0da417b194895
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Wed Feb 15 14:56:10 2012 +0200
Enable osgi requires generation by default.
depgenerators/fileattrs/osgi.attr | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/depgenerators/fileattrs/osgi.attr b/depgenerators/fileattrs/osgi.attr
index 31690bd..fb05baf 100644
--- a/depgenerators/fileattrs/osgi.attr
+++ b/depgenerators/fileattrs/osgi.attr
@@ -1,4 +1,4 @@
%__osgi_provides %{_rpmconfigdir}/osgi.prov
-#%__osgi_requires %{_rpmconfigdir}/osgi.req
+%__osgi_requires %{_rpmconfigdir}/osgi.req
%__osgi_path ^(.*\.jar|((%{_libdir}|%{_datadir}).*/MANIFEST.MF))
12 years, 3 months
[javapackages] Do not generate requires for optional Require-Bundles.
by Alexander Kurtakov
commit 12da19d8d435e3787f67099b4c6484ec4920d510
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Wed Feb 15 14:55:04 2012 +0200
Do not generate requires for optional Require-Bundles.
Also add eclipse project files to ease importing into eclipse.
.project | 17 +++++++++++++++++
.pydevproject | 10 ++++++++++
depgenerators/osgi.req | 10 +++++++++-
3 files changed, 36 insertions(+), 1 deletions(-)
---
diff --git a/.project b/.project
new file mode 100644
index 0000000..3c357bb
--- /dev/null
+++ b/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>javapackages</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.python.pydev.PyDevBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.python.pydev.pythonNature</nature>
+ </natures>
+</projectDescription>
diff --git a/.pydevproject b/.pydevproject
new file mode 100644
index 0000000..4e50420
--- /dev/null
+++ b/.pydevproject
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?eclipse-pydev version="1.0"?>
+
+<pydev_project>
+<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
+<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property>
+<pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
+<path>/javapackages</path>
+</pydev_pathproperty>
+</pydev_project>
diff --git a/depgenerators/osgi.req b/depgenerators/osgi.req
index 2bcd312..c6d515f 100755
--- a/depgenerators/osgi.req
+++ b/depgenerators/osgi.req
@@ -64,13 +64,21 @@ class TagBuilder:
def split_bundle_name (self, bundles):
bundlenames = []
+ bundleline = ""
for bundle in bundles.split(','):
- if ")" in bundle or "]" in bundle:
+ if "(" in bundle or "[" in bundle:
+ bundleline = bundle
+ continue
+ if bundleline:
+ bundle = bundleline + bundle
+ if ":=optional" in bundle:
+ bundleline = ""
continue
if ";" in bundle:
bundlenames.append(bundle.split(";")[0].strip())
else:
bundlenames.append(bundle.strip())
+ bundleline = ""
return bundlenames
def get_osgi_require (self, path):
12 years, 3 months
[maven-archiver] Update to latest upstream release.
by Alexander Kurtakov
commit 967b6b2e9e6e8b2763c6b1c225c93349a8238d92
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Wed Feb 15 13:54:12 2012 +0200
Update to latest upstream release.
.gitignore | 1 +
maven-archiver.spec | 9 ++++++---
sources | 2 +-
3 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 48e41f4..95f0db1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ maven-archiver-2.2-src.tgz
maven-archiver-2.4-src.tar.bz2
maven-archiver-2.4.1-src.tar.xz
maven-archiver-2.4.2-source-release.zip
+maven-archiver-2.5-source-release.zip
diff --git a/maven-archiver.spec b/maven-archiver.spec
index 765f9f1..a2b8d6c 100644
--- a/maven-archiver.spec
+++ b/maven-archiver.spec
@@ -29,13 +29,13 @@
#
Name: maven-archiver
-Version: 2.4.2
-Release: 2%{?dist}
+Version: 2.5
+Release: 1%{?dist}
Epoch: 0
Summary: Maven Archiver
License: ASL 2.0
Group: Development/Libraries
-URL: http://maven.apache.org/
+URL: http://maven.apache.org/shared/maven-archiver/
Source0: http://repo1.maven.org/maven2/org/apache/maven/%{name}/%{version}/%{name}...
@@ -119,6 +119,9 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%doc %{_javadocdir}/*
%changelog
+* Wed Feb 15 2012 Alexander Kurtakov <akurtako(a)redhat.com> 0:2.5-1
+- Update to latest upstream release.
+
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0:2.4.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
diff --git a/sources b/sources
index 7735b9c..283aef7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-439c6ee7e817f367b7c6d004d333512d maven-archiver-2.4.2-source-release.zip
+dfd2a24519f21cbe2e21cb48fd73d7c1 maven-archiver-2.5-source-release.zip
12 years, 3 months
[plexus-archiver] Update to latest upstream release.
by Alexander Kurtakov
commit c7a7a8816b12796df732da192b441c003dd477a7
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Wed Feb 15 13:52:01 2012 +0200
Update to latest upstream release.
.gitignore | 1 +
plexus-archiver.spec | 15 +++++++++------
sources | 2 +-
3 files changed, 11 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1938e89..91ddd05 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ plexus-archiver-1.0-alpha-12-src.tar.bz2
plexus-archiver-1.1-src.tar.xz
/plexus-archiver-1.2.tar.xz
plexus-archiver-2.0.1.tar.xz
+sonatype-plexus-archiver-plexus-archiver-2.1-0-g9913f73.tar.gz
diff --git a/plexus-archiver.spec b/plexus-archiver.spec
index be4369d..ff087c0 100644
--- a/plexus-archiver.spec
+++ b/plexus-archiver.spec
@@ -29,16 +29,16 @@
#
Name: plexus-archiver
-Version: 2.0.1
-Release: 3%{?dist}
+Version: 2.1
+Release: 1%{?dist}
Epoch: 0
Summary: Plexus Archiver Component
License: MIT and ASL 2.0
Group: Development/Libraries
URL: http://plexus.codehaus.org/plexus-components/plexus-archiver/
# git clone https://github.com/sonatype/plexus-archiver
-# git archive --format=tar --prefix=plexus-archiver-2.0.1/ plexus-archiver-2.0.1 | xz >plexus-archiver-2.0.1.tar.xz
-Source0: %{name}-%{version}.tar.xz
+# Fetched from https://github.com/sonatype/plexus-archiver/tarball/plexus-archiver-2.1
+Source0: sonatype-plexus-archiver-plexus-archiver-2.1-0-g9913f73.tar.gz
BuildArch: noarch
@@ -83,10 +83,10 @@ Javadoc for %{name}.
%prep
-%setup -q
+%setup -q -n sonatype-plexus-archiver-8b3fb4c
%build
-mvn-rpmbuild install javadoc:javadoc
+mvn-rpmbuild -Dmaven.test.skip=true install javadoc:javadoc
%install
# jars
@@ -113,6 +113,9 @@ cp -pr target/site/api*/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%doc %{_javadocdir}/%{name}
%changelog
+* Wed Feb 15 2012 Alexander Kurtakov <akurtako(a)redhat.com> 0:2.1-1
+- Update to latest upstream release.
+
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0:2.0.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
diff --git a/sources b/sources
index 64375ab..f600130 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-36cfecc86b49513910f043afb0ce09cf plexus-archiver-2.0.1.tar.xz
+7bfd077166db1c65537bc34750e556a7 sonatype-plexus-archiver-plexus-archiver-2.1-0-g9913f73.tar.gz
12 years, 3 months
[maven-pmd-plugin] Update to latest upstream.
by Alexander Kurtakov
commit 186edb47fa280723b2d2418cc1080f43248847bf
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Tue Feb 14 22:44:54 2012 +0200
Update to latest upstream.
.gitignore | 1 +
0001-fix-pmd-artifactId.patch | 25 -------------------------
maven-pmd-plugin.spec | 9 +++++----
sources | 2 +-
4 files changed, 7 insertions(+), 30 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 12f3e72..67f2f92 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
maven-pmd-plugin-2.5.tar.xz
/maven-pmd-plugin-2.5-source-release.zip
maven-pmd-plugin-2.6-source-release.zip
+maven-pmd-plugin-2.7-source-release.zip
diff --git a/maven-pmd-plugin.spec b/maven-pmd-plugin.spec
index 5655bc7..ede6ea4 100644
--- a/maven-pmd-plugin.spec
+++ b/maven-pmd-plugin.spec
@@ -1,13 +1,12 @@
Name: maven-pmd-plugin
-Version: 2.6
-Release: 2%{?dist}
+Version: 2.7
+Release: 1%{?dist}
Summary: Maven PMD Plugin
Group: Development/Libraries
License: ASL 2.0
URL: http://maven.apache.org/plugins/maven-pmd-plugin/
Source0: http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}...
-Patch0: 0001-fix-pmd-artifactId.patch
BuildArch: noarch
@@ -58,7 +57,6 @@ API documentation for %{name}.
%prep
%setup -q
-%patch0 -p1
%build
mvn-rpmbuild \
@@ -90,6 +88,9 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
%{_javadocdir}/%{name}
%changelog
+* Tue Feb 14 2012 Alexander Kurtakov <akurtako(a)redhat.com> 2.7-1
+- Update to latest upstream.
+
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.6-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
diff --git a/sources b/sources
index c845d66..ee84d66 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5db28bb18bad1c711277aebe56aafe36 maven-pmd-plugin-2.6-source-release.zip
+221dcbac16b08c6954d1967274d0d102 maven-pmd-plugin-2.7-source-release.zip
12 years, 3 months