Login
[x]
Log in using an account from:
Fedora Account System
Red Hat Associate
Red Hat Customer
Or login using a Red Hat Bugzilla account
Forgot Password
Login:
Hide Forgot
Create an Account
Red Hat Bugzilla – Attachment 649273 Details for
Bug 878931
geronimo-osgi-support: update to 1.1
[?]
New
Simple Search
Advanced Search
My Links
Browse
Requests
Reports
Current State
Search
Tabular reports
Graphical reports
Duplicates
Other Reports
User Changes
Plotly Reports
Bug Status
Bug Severity
Non-Defaults
|
Product Dashboard
Help
Page Help!
Bug Writing Guidelines
What's new
Browser Support Policy
5.0.4.rh83 Release notes
FAQ
Guides index
User guide
Web Services
Contact
Legal
This site requires JavaScript to be enabled to function correctly, please enable it.
[patch]
update to 1.1
0001-update-to-1.1.patch (text/plain), 4.48 KB, created by
gil cattaneo
on 2012-11-21 15:02:40 UTC
(
hide
)
Description:
update to 1.1
Filename:
MIME Type:
Creator:
gil cattaneo
Created:
2012-11-21 15:02:40 UTC
Size:
4.48 KB
patch
obsolete
>From d0bd3574115f7cd48d077586cc0af6ca4563adb0 Mon Sep 17 00:00:00 2001 >From: gil <puntogil@libero.it> >Date: Wed, 21 Nov 2012 15:57:53 +0100 >Subject: [PATCH] update to 1.1 > >--- > .gitignore | 1 + > geronimo-osgi-support.spec | 60 +++++++++++++++++++++++++++++++++---------- > sources | 2 +- > 3 files changed, 48 insertions(+), 15 deletions(-) > >diff --git a/.gitignore b/.gitignore >index 98efd9d..c98f173 100644 >--- a/.gitignore >+++ b/.gitignore >@@ -1 +1,2 @@ > geronimo-osgi-support-1.0-source-release.tar.gz >+/geronimo-osgi-support-1.1-source-release.tar.gz >diff --git a/geronimo-osgi-support.spec b/geronimo-osgi-support.spec >index 97d671c..74eeaa0 100644 >--- a/geronimo-osgi-support.spec >+++ b/geronimo-osgi-support.spec >@@ -2,19 +2,15 @@ > %global locator geronimo-osgi-locator > > Name: geronimo-osgi-support >-Version: 1.0 >-Release: 9%{?dist} >+Version: 1.1 >+Release: 1%{?dist} > Summary: OSGI spec bundle support > Group: Development/Libraries > License: ASL 2.0 and W3C > URL: http://geronimo.apache.org/ > > Source0: http://repo2.maven.org/maven2/org/apache/geronimo/specs/%{name}/%{version}/%{name}-%{version}-source-release.tar.gz >-Source1: %{name}.depmap >-# Use parent pom files instead of unavailable 'genesis-java5-flava' >-Patch1: use_parent_pom.patch >-# Remove itests due to unavailable dependencies >-Patch2: remove-itests.patch >+ > BuildArch: noarch > > BuildRequires: java-devel >= 1:1.6.0 >@@ -26,6 +22,10 @@ BuildRequires: geronimo-parent-poms > BuildRequires: maven-resources-plugin > BuildRequires: maven-surefire-provider-junit4 > >+# geronimo-osgi-registry-itests deps >+# felix-configadmin >+# pax-logging >+ > Requires: java >= 1:1.6.0 > Requires: jpackage-utils > Requires: felix-osgi-core >@@ -51,16 +51,45 @@ This package contains the API documentation for %{name}. > %setup -q > iconv -f iso8859-1 -t utf-8 LICENSE > LICENSE.conv && mv -f LICENSE.conv LICENSE > sed -i 's/\r//' LICENSE NOTICE >-%patch1 -p0 >-%patch2 -p0 >- >-%pom_xpath_inject "pom:plugin[pom:artifactId[text()='maven-bundle-plugin']] >- /pom:configuration/pom:instructions" " >- <Export-Package>!*</Export-Package>" geronimo-osgi-locator >+# Use parent pom files instead of unavailable 'genesis-java5-flava' >+%pom_remove_parent >+%pom_add_parent org.apache.geronimo.specs:specs >+ >+# unwanted modules ? >+%pom_disable_module geronimo-osgi-itesta >+%pom_disable_module geronimo-osgi-itestb >+%pom_disable_module geronimo-osgi-locator-itests >+ >+# unavailable deps >+# mvn(org.ops4j.pax.exam:pax-exam) >+# mvn(org.ops4j.pax.exam:pax-exam-junit) >+# mvn(org.ops4j.pax.exam:pax-exam-container-default) >+# mvn(org.ops4j.pax.exam:pax-exam-junit-extender-impl) >+# mvn(org.ops4j.pax.swissbox:pax-swissbox-tinybundles) >+%pom_disable_module geronimo-osgi-registry-itests >+ >+# disable embedded system library copy >+# set proper org.apache.geronimo.osgi.locator version >+%pom_remove_plugin org.apache.felix:maven-bundle-plugin geronimo-osgi-locator >+%pom_xpath_inject "pom:build/pom:plugins" ' >+<plugin> >+ <groupId>org.apache.felix</groupId> >+ <artifactId>maven-bundle-plugin</artifactId> >+ <configuration> >+ <instructions> >+ <Import-Package>*</Import-Package> >+ <Export-Package>org.apache.geronimo.osgi.locator;version=1.1</Export-Package> >+ <Private-Package>org.apache.geronimo.osgi.locator</Private-Package> >+ <Bundle-SymbolicName>${project.groupId}.${project.artifactId};singleton=true</Bundle-SymbolicName> >+ </instructions> >+ </configuration> >+</plugin>' geronimo-osgi-locator >+ >+sed -i 's|${artifactId}|${project.artifactId}|;s|${groupId}|${project.groupId}|;s|${version}|${project.version}|' $(find -name "pom.xml") > > %build > mvn-rpmbuild \ >- -Dmaven.local.depmap.file="%{SOURCE1}" \ >+ -Dproject.build.sourceEncoding=UTF-8 \ > install javadoc:aggregate > > %install >@@ -94,6 +123,9 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/ > %{_javadocdir}/%{name} > > %changelog >+* Sun Nov 18 2012 gil cattaneo <puntogil@libero.it> 1.1-1 >+- update to 1.1 >+ > * Thu Aug 23 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.0-9 > - Fix license tag > - Install NOTICE files >diff --git a/sources b/sources >index fc14be8..f289a33 100644 >--- a/sources >+++ b/sources >@@ -1 +1 @@ >-a9f60cde780aff4f95f37c68fc9c223b geronimo-osgi-support-1.0-source-release.tar.gz >+33c3d4977da7824da1afdb692fc4c7d1 geronimo-osgi-support-1.1-source-release.tar.gz >-- >1.7.7.6 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 878931
: 649273