[pax-logging/f17] fix build in f17
gil
gil at fedoraproject.org
Mon Oct 15 18:45:20 UTC 2012
commit e8055c471276c953b9fb384a1d191e242f349b58
Author: gil <puntogil at libero.it>
Date: Mon Oct 15 20:45:01 2012 +0200
fix build in f17
pax-logging-1.6.9-buildfix-for-f17.patch | 253 ++++++++++++++++++++++++++++++
pax-logging.spec | 15 ++-
2 files changed, 263 insertions(+), 5 deletions(-)
---
diff --git a/pax-logging-1.6.9-buildfix-for-f17.patch b/pax-logging-1.6.9-buildfix-for-f17.patch
new file mode 100644
index 0000000..0a3ed0f
--- /dev/null
+++ b/pax-logging-1.6.9-buildfix-for-f17.patch
@@ -0,0 +1,253 @@
+diff -Nru pax-logging-1.6.9/pax-logging-api/pom.xml pax-logging-1.6.9-gil/pax-logging-api/pom.xml
+--- pax-logging-1.6.9/pax-logging-api/pom.xml 2012-06-22 09:19:10.000000000 +0200
++++ pax-logging-1.6.9-gil/pax-logging-api/pom.xml 2012-10-15 20:33:10.674802493 +0200
+@@ -24,34 +24,8 @@
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ </plugin>
+- <plugin>
+- <groupId>org.ops4j</groupId>
+- <artifactId>maven-pax-plugin</artifactId>
+- </plugin>
+- <plugin>
+- <groupId>org.apache.maven.plugins</groupId>
+- <artifactId>maven-dependency-plugin</artifactId>
+- <executions>
+- <execution>
+- <id>unpack</id>
+- <phase>generate-resources</phase>
+- <goals>
+- <goal>unpack</goal>
+- </goals>
+- <configuration>
+- <artifactItems>
+- <artifactItem>
+- <groupId>avalon-framework</groupId>
+- <artifactId>avalon-framework-api</artifactId>
+- </artifactItem>
+- </artifactItems>
+- <outputDirectory>
+- ${project.build.directory}/classes
+- </outputDirectory>
+- </configuration>
+- </execution>
+- </executions>
+- </plugin>
++ <!-- plugin disabled by maintainer: org.ops4j:maven-pax-plugin -->
++ <!-- plugin disabled by maintainer: org.apache.maven.plugins:maven-dependency-plugin -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+@@ -77,14 +51,8 @@
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ </dependency>
+- <dependency>
+- <groupId>junit</groupId>
+- <artifactId>junit</artifactId>
+- </dependency>
+- <dependency>
+- <groupId>jmock</groupId>
+- <artifactId>jmock</artifactId>
+- </dependency>
++ <!-- dependency disabled by maintainer: junit:junit -->
++ <!-- dependency disabled by maintainer: jmock:jmock -->
+ <dependency>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework-api</artifactId>
+diff -Nru pax-logging-1.6.9/pax-logging-service/pom.xml pax-logging-1.6.9-gil/pax-logging-service/pom.xml
+--- pax-logging-1.6.9/pax-logging-service/pom.xml 2012-06-22 09:19:10.000000000 +0200
++++ pax-logging-1.6.9-gil/pax-logging-service/pom.xml 2012-10-15 20:33:10.822793371 +0200
+@@ -27,34 +27,8 @@
+ <plugin>
+ <artifactId>maven-source-plugin</artifactId>
+ </plugin>
+- <plugin>
+- <groupId>org.ops4j</groupId>
+- <artifactId>maven-pax-plugin</artifactId>
+- </plugin>
+- <plugin>
+- <groupId>org.apache.maven.plugins</groupId>
+- <artifactId>maven-dependency-plugin</artifactId>
+- <executions>
+- <execution>
+- <id>unpack</id>
+- <phase>generate-resources</phase>
+- <goals>
+- <goal>unpack</goal>
+- </goals>
+- <configuration>
+- <artifactItems>
+- <artifactItem>
+- <groupId>log4j</groupId>
+- <artifactId>log4j</artifactId>
+- </artifactItem>
+- </artifactItems>
+- <outputDirectory>
+- ${project.build.directory}/classes
+- </outputDirectory>
+- </configuration>
+- </execution>
+- </executions>
+- </plugin>
++ <!-- plugin disabled by maintainer: org.ops4j:maven-pax-plugin -->
++ <!-- plugin disabled by maintainer: org.apache.maven.plugins:maven-dependency-plugin -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+@@ -68,29 +42,7 @@
+ </execution>
+ </executions>
+ </plugin>
+- <plugin>
+- <groupId>org.apache.maven.plugins</groupId>
+- <artifactId>maven-shade-plugin</artifactId>
+- <executions>
+- <execution>
+- <phase>package</phase>
+- <goals>
+- <goal>shade</goal>
+- </goals>
+- <configuration>
+- <artifactSet>
+- <includes>
+- <include>log4j:log4j</include>
+- <include>${project.groupId}:${project.artifactId}</include>
+- </includes>
+- </artifactSet>
+- <createSourcesJar>true</createSourcesJar>
+- <promoteTransitiveDependencies>false</promoteTransitiveDependencies>
+- <createDependencyReducedPom>false</createDependencyReducedPom>
+- </configuration>
+- </execution>
+- </executions>
+- </plugin>
++ <!-- plugin disabled by maintainer: org.apache.maven.plugins:maven-shade-plugin -->
+ </plugins>
+ </build>
+
+@@ -103,10 +55,7 @@
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ </dependency>
+- <dependency>
+- <groupId>jmock</groupId>
+- <artifactId>jmock</artifactId>
+- </dependency>
++ <!-- dependency disabled by maintainer: jmock:jmock -->
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+diff -Nru pax-logging-1.6.9/pom.xml pax-logging-1.6.9-gil/pom.xml
+--- pax-logging-1.6.9/pom.xml 2012-06-22 09:19:10.000000000 +0200
++++ pax-logging-1.6.9-gil/pom.xml 2012-10-15 20:33:10.528811493 +0200
+@@ -2,11 +2,7 @@
+
+ <modelVersion>4.0.0</modelVersion>
+
+- <parent>
+- <groupId>org.ops4j.pax</groupId>
+- <artifactId>master</artifactId>
+- <version>3.1.3</version>
+- </parent>
++ <!-- parent POM reference removed by maintainer -->
+
+ <groupId>org.ops4j.pax</groupId>
+ <artifactId>logging</artifactId>
+@@ -52,16 +48,8 @@
+ </instructions>
+ </configuration>
+ </plugin>
+- <plugin>
+- <groupId>org.ops4j</groupId>
+- <artifactId>maven-pax-plugin</artifactId>
+- <version>1.4</version>
+- </plugin>
+- <plugin>
+- <groupId>org.apache.maven.plugins</groupId>
+- <artifactId>maven-shade-plugin</artifactId>
+- <version>1.4</version>
+- </plugin>
++ <!-- plugin disabled by maintainer: org.ops4j:maven-pax-plugin -->
++ <!-- plugin disabled by maintainer: org.apache.maven.plugins:maven-shade-plugin -->
+ </plugins>
+ </pluginManagement>
+ </build>
+@@ -81,12 +69,7 @@
+ <version>4.2.0</version>
+ <scope>provided</scope>
+ </dependency>
+- <dependency>
+- <groupId>jmock</groupId>
+- <artifactId>jmock</artifactId>
+- <version>1.0.1</version>
+- <scope>test</scope>
+- </dependency>
++ <!-- dependency disabled by maintainer: jmock:jmock -->
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+@@ -127,45 +110,15 @@
+ </dependency>
+
+ <!-- Test dependencies-->
+- <dependency>
+- <groupId>junit</groupId>
+- <artifactId>junit</artifactId>
+- <version>4.10</version>
+- <scope>test</scope>
+- </dependency>
+- <dependency>
+- <groupId>org.easymock</groupId>
+- <artifactId>easymock</artifactId>
+- <version>3.1</version>
+- <scope>test</scope>
+- </dependency>
+- <dependency>
+- <groupId>org.ops4j.pax.exam</groupId>
+- <artifactId>pax-exam</artifactId>
+- <version>1.2.4</version>
+- </dependency>
+- <dependency>
+- <groupId>org.ops4j.pax.exam</groupId>
+- <artifactId>pax-exam-container-default</artifactId>
+- <version>1.2.4</version>
+- </dependency>
+- <dependency>
+- <groupId>org.ops4j.pax.exam</groupId>
+- <artifactId>pax-exam-junit</artifactId>
+- <version>1.2.4</version>
+- </dependency>
+- <dependency>
+- <groupId>org.ops4j.pax.runner</groupId>
+- <artifactId>pax-runner-no-jcl</artifactId>
+- <version>1.7.6</version>
+- </dependency>
++ <!-- dependency disabled by maintainer: junit:junit -->
++ <!-- dependency disabled by maintainer: org.easymock:easymock -->
++ <!-- dependency disabled by maintainer: org.ops4j.pax.exam:pax-exam -->
++ <!-- dependency disabled by maintainer: org.ops4j.pax.exam:pax-exam-container-default -->
++ <!-- dependency disabled by maintainer: org.ops4j.pax.exam:pax-exam-junit -->
++ <!-- dependency disabled by maintainer: org.ops4j.pax.runner:pax-runner-no-jcl -->
+
+ <!-- sample dependencies -->
+- <dependency>
+- <groupId>org.mortbay.jetty</groupId>
+- <artifactId>jetty</artifactId>
+- <version>6.1.26</version>
+- </dependency>
++ <!-- dependency disabled by maintainer: org.mortbay.jetty:jetty -->
+
+ </dependencies>
+ </dependencyManagement>
+@@ -302,8 +255,8 @@
+ <modules>
+ <module>pax-logging-api</module>
+ <module>pax-logging-service</module>
+- <module>pax-logging-it</module>
+- <module>pax-logging-samples</module>
++ <!-- module disabled by maintainer: pax-logging-it -->
++ <!-- module disabled by maintainer: pax-logging-samples -->
+ </modules>
+
+ </project>
diff --git a/pax-logging.spec b/pax-logging.spec
index 7bff524..80261a2 100644
--- a/pax-logging.spec
+++ b/pax-logging.spec
@@ -8,6 +8,7 @@ URL: http://team.ops4j.org/wiki//display/paxlogging/Pax+Logging
# git clone git://github.com/ops4j/org.ops4j.pax.logging.git pax-logging-1.6.9
# cd pax-logging-1.6.9 && git archive --format=tar --prefix=pax-logging-1.6.9/ logging-1.6.9 | xz > pax-logging-1.6.9-src-git.tar.xz
Source0: %{name}-%{version}-src-git.tar.xz
+Patch0: %{name}-%{version}-buildfix-for-f17.patch
BuildRequires: java-devel
BuildRequires: jpackage-utils
@@ -49,6 +50,9 @@ This package contains javadoc for %{name}.
%prep
%setup -q
+%if %{?fedora} < 18
+%patch0 -p1
+%else
%pom_remove_parent
%pom_disable_module pax-logging-it
%pom_disable_module pax-logging-samples
@@ -67,11 +71,6 @@ This package contains javadoc for %{name}.
%pom_remove_plugin org.ops4j:maven-pax-plugin
%pom_remove_plugin org.apache.maven.plugins:maven-shade-plugin
-sed -i "s|<source>1.4</source>|<source>1.5</source>|" pom.xml
-sed -i "s|<target>1.4</target>|<target>1.5</target>|" pom.xml
-# prevent log4j re-bundle
-sed -i "s|<_include>-osgi.bnd</_include>|<!--_include>-osgi.bnd</_include-->|" pom.xml
-
%pom_remove_dep jmock:jmock pax-logging-api
%pom_remove_dep junit:junit pax-logging-api
%pom_remove_plugin org.ops4j:maven-pax-plugin pax-logging-api
@@ -81,6 +80,12 @@ sed -i "s|<_include>-osgi.bnd</_include>|<!--_include>-osgi.bnd</_include-->|" p
%pom_remove_plugin org.ops4j:maven-pax-plugin pax-logging-service
%pom_remove_plugin org.apache.maven.plugins:maven-shade-plugin pax-logging-service
%pom_remove_plugin org.apache.maven.plugins:maven-dependency-plugin pax-logging-service
+%endif
+
+sed -i "s|<source>1.4</source>|<source>1.5</source>|" pom.xml
+sed -i "s|<target>1.4</target>|<target>1.5</target>|" pom.xml
+# prevent log4j re-bundle
+sed -i "s|<_include>-osgi.bnd</_include>|<!--_include>-osgi.bnd</_include-->|" pom.xml
%build
More information about the scm-commits
mailing list