[sisu] Update to upstream milestone 0.3.0.M1
by Mikolaj Izdebski
commit 80e53710f524d248402cab752682f5cc23be665d
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Wed Feb 4 07:00:16 2015 +0100
Update to upstream milestone 0.3.0.M1
.gitignore | 2 +
sisu-ignored-tests.patch | 151 ++++++++++++++++++++++++++++++++++++++++++++++
sisu.spec | 23 +++++---
sources | 4 +-
4 files changed, 170 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index eaa901a..bd7e4bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,5 @@
/org.eclipse.sisu.plexus-0.2.0.tar.bz2
/org.eclipse.sisu.inject-0.2.1.tar.bz2
/org.eclipse.sisu.plexus-0.2.1.tar.bz2
+/org.eclipse.sisu.inject-0.3.0.M1.tar.bz2
+/org.eclipse.sisu.plexus-0.3.0.M1.tar.bz2
diff --git a/sisu-ignored-tests.patch b/sisu-ignored-tests.patch
index 1115049..484fa7d 100644
--- a/sisu-ignored-tests.patch
+++ b/sisu-ignored-tests.patch
@@ -52,3 +52,154 @@
public void testMarkedWithAttributesSearch()
{
final LocatedBeans<Marked, Bean> beans =
+--- sisu-plexus/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/PlexusXmlScannerTest.java~ 2014-08-24 01:48:47.000000000 +0200
++++ sisu-plexus/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/PlexusXmlScannerTest.java 2015-02-04 07:06:49.696531924 +0100
+@@ -159,83 +159,6 @@
+ new PlexusXmlScanner( null, plexusXml, null ).scan( space, true );
+ }
+
+- @SuppressWarnings( "deprecation" )
+- public void testComponents()
+- {
+- final ClassSpace space = new URLClassSpace( PlexusXmlScannerTest.class.getClassLoader() );
+-
+- final Map<String, PlexusBeanMetadata> metadata = new HashMap<String, PlexusBeanMetadata>();
+- final PlexusXmlScanner scanner = new PlexusXmlScanner( null, null, metadata );
+-
+- final Map<Component, DeferredClass<?>> componentMap = scanner.scan( space, true );
+-
+- assertEquals( 6, componentMap.size() );
+-
+- final Component component1 =
+- new ComponentImpl( DefaultBean.class, Hints.DEFAULT_HINT, Strategies.PER_LOOKUP, "" );
+- assertEquals( DefaultBean.class, componentMap.get( component1 ).load() );
+-
+- final Component component2 = new ComponentImpl( Bean.class, "debug", Strategies.SINGLETON, "For debugging" );
+- assertEquals( DebugBean.class, componentMap.get( component2 ).load() );
+-
+- final Component component3 = new ComponentImpl( Bean.class, Hints.DEFAULT_HINT, Strategies.SINGLETON, "" );
+- assertEquals( AnotherBean.class, componentMap.get( component3 ).load() );
+-
+- final Component component4 = new ComponentImpl( Bean.class, "clone", Strategies.SINGLETON, "" );
+- assertEquals( DefaultBean.class, componentMap.get( component4 ).load().getSuperclass() );
+- final Class<?> proxy = CustomTestClassLoader.proxy( componentMap.get( component4 ).load() );
+-
+- try
+- {
+- assertNotNull( proxy.getMethod( "TestMe" ) );
+- }
+- catch ( final NoSuchMethodException e )
+- {
+- fail( "Proxied class is missing 'TestMe' method" );
+- }
+-
+- final PlexusBeanMetadata metadata1 = metadata.get( DefaultBean.class.getName() );
+-
+- assertFalse( metadata1.isEmpty() );
+-
+- assertEquals( new ConfigurationImpl( "someFieldName", "<some-field-name><item>PRIMARY</item></some-field-name>" ),
+- metadata1.getConfiguration( new NamedProperty( "someFieldName" ) ) );
+-
+- assertEquals( new ConfigurationImpl( "simple", "value" ),
+- metadata1.getConfiguration( new NamedProperty( "simple" ) ) );
+-
+- assertEquals( new ConfigurationImpl( "value", "<value with=\"attribute\"></value>" ),
+- metadata1.getConfiguration( new NamedProperty( "value" ) ) );
+-
+- assertEquals( new ConfigurationImpl( "emptyValue1", "<empty-value1 with=\"attribute\" />" ),
+- metadata1.getConfiguration( new NamedProperty( "emptyValue1" ) ) );
+-
+- assertEquals( new ConfigurationImpl( "emptyValue2", "" ),
+- metadata1.getConfiguration( new NamedProperty( "emptyValue2" ) ) );
+-
+- assertFalse( metadata1.isEmpty() );
+-
+- assertEquals( new RequirementImpl( Bean.class, true, "debug" ),
+- metadata1.getRequirement( new NamedProperty( "bean", TypeLiteral.get( Bean.class ) ) ) );
+-
+- assertFalse( metadata1.isEmpty() );
+-
+- metadata1.getConfiguration( new NamedProperty( "foo" ) );
+-
+- assertEquals( new RequirementImpl( Bean.class, false, Hints.DEFAULT_HINT, "debug" ),
+- metadata1.getRequirement( new NamedProperty( "beanMap" ) ) );
+-
+- assertFalse( metadata1.isEmpty() );
+-
+- assertEquals( new RequirementImpl( Bean.class, false ),
+- metadata1.getRequirement( new NamedProperty( "beanField" ) ) );
+-
+- assertTrue( metadata1.isEmpty() );
+-
+- assertNotNull( metadata.get( AnotherBean.class.getName() ) );
+- assertNull( metadata.get( DebugBean.class.getName() ) );
+- }
+-
+ static class FixedClassSpace
+ implements ClassSpace
+ {
+@@ -392,64 +315,4 @@
+ }
+ }
+
+- static final class CustomTestClassLoader
+- extends ClassLoader
+- {
+- private static final String PROXY_MARKER = "$proxy";
+-
+- CustomTestClassLoader( final ClassLoader parent )
+- {
+- super( parent );
+- }
+-
+- static Class<?> proxy( final Class<?> clazz )
+- {
+- try
+- {
+- return new CustomTestClassLoader( clazz.getClassLoader() ).loadClass( clazz.getName() + PROXY_MARKER );
+- }
+- catch ( final ClassNotFoundException e )
+- {
+- throw new TypeNotPresentException( clazz.getName(), e );
+- }
+- }
+-
+- @Override
+- protected synchronized Class<?> loadClass( final String name, final boolean resolve )
+- throws ClassNotFoundException
+- {
+- return super.loadClass( name, resolve );
+- }
+-
+- @Override
+- protected Class<?> findClass( final String name )
+- throws ClassNotFoundException
+- {
+- final String proxyName = name.replace( '.', '/' );
+- final String superName = proxyName.substring( 0, proxyName.length() - PROXY_MARKER.length() );
+-
+- final ClassWriter cw = new ClassWriter( ClassWriter.COMPUTE_MAXS );
+- cw.visit( Opcodes.V1_5, Modifier.PUBLIC | Modifier.FINAL, proxyName, null, superName, null );
+- MethodVisitor mv = cw.visitMethod( Modifier.PUBLIC, "<init>", "()V", null, null );
+-
+- mv.visitCode();
+- mv.visitVarInsn( Opcodes.ALOAD, 0 );
+- mv.visitMethodInsn( Opcodes.INVOKESPECIAL, superName, "<init>", "()V", false );
+- mv.visitInsn( Opcodes.RETURN );
+- mv.visitMaxs( 0, 0 );
+- mv.visitEnd();
+-
+- mv = cw.visitMethod( Modifier.PUBLIC, "TestMe", "()V", null, null );
+-
+- mv.visitCode();
+- mv.visitInsn( Opcodes.RETURN );
+- mv.visitMaxs( 0, 0 );
+- mv.visitEnd();
+- cw.visitEnd();
+-
+- final byte[] buf = cw.toByteArray();
+-
+- return defineClass( name, buf, 0, buf.length );
+- }
+- }
+ }
diff --git a/sisu.spec b/sisu.spec
index ff4d5e0..d3b440e 100644
--- a/sisu.spec
+++ b/sisu.spec
@@ -1,7 +1,11 @@
+# Release type, either "milestone" or "release"
+%global reltype milestone
+%global reltag .M1
+
Name: sisu
Epoch: 1
-Version: 0.2.1
-Release: 10%{?dist}
+Version: 0.3.0
+Release: 0.1%{?reltag}%{?dist}
Summary: Eclipse dependency injection framework
# bundled asm is under BSD
# See also: https://fedorahosted.org/fpc/ticket/346
@@ -10,8 +14,8 @@ URL: http://eclipse.org/sisu
# TODO: unbundle asm
-Source0: http://git.eclipse.org/c/%{name}/org.eclipse.%{name}.inject.git/snapshot/...
-Source1: http://git.eclipse.org/c/%{name}/org.eclipse.%{name}.plexus.git/snapshot/...
+Source0: http://git.eclipse.org/c/%{name}/org.eclipse.%{name}.inject.git/snapshot/...
+Source1: http://git.eclipse.org/c/%{name}/org.eclipse.%{name}.plexus.git/snapshot/...
Patch0: %{name}-OSGi-import-guava.patch
Patch1: %{name}-java8.patch
@@ -115,8 +119,8 @@ This package contains %{summary}.
%prep
%setup -q -c -T
-tar xf %{SOURCE0} && mv releases/* sisu-inject && rmdir releases
-tar xf %{SOURCE1} && mv releases/* sisu-plexus && rmdir releases
+tar xf %{SOURCE0} && mv %{reltype}s/* sisu-inject && rmdir %{reltype}s
+tar xf %{SOURCE1} && mv %{reltype}s/* sisu-plexus && rmdir %{reltype}s
%patch0
%patch1
@@ -184,9 +188,9 @@ EOF
%install
%mvn_artifact sisu-inject/pom.xml
-%mvn_artifact sisu-inject/org.eclipse.sisu.inject/pom.xml sisu-inject/org.eclipse.sisu.inject/target/org.eclipse.sisu.inject-%{version}.jar
+%mvn_artifact sisu-inject/org.eclipse.sisu.inject/pom.xml sisu-inject/org.eclipse.sisu.inject/target/org.eclipse.sisu.inject-%{version}%{?reltag}.jar
%mvn_artifact sisu-plexus/pom.xml
-%mvn_artifact sisu-plexus/org.eclipse.sisu.plexus/pom.xml sisu-plexus/org.eclipse.sisu.plexus/target/org.eclipse.sisu.plexus-%{version}.jar
+%mvn_artifact sisu-plexus/org.eclipse.sisu.plexus/pom.xml sisu-plexus/org.eclipse.sisu.plexus/target/org.eclipse.sisu.plexus-%{version}%{?reltag}.jar
%mvn_install
@@ -201,6 +205,9 @@ EOF
%changelog
+* Wed Feb 4 2015 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1:0.3.0-0.1.M1
+- Update to upstream milestone 0.3.0.M1
+
* Tue Sep 30 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1:0.2.1-10
- Port to plexus-utils 3.0.18
diff --git a/sources b/sources
index a256204..8794505 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-cec0b709e3718e3d220b00cc67b4292c org.eclipse.sisu.inject-0.2.1.tar.bz2
-d7b14e659f55ddb3f74384d39e5096ce org.eclipse.sisu.plexus-0.2.1.tar.bz2
+7c8e0b75878b71e5b77e2a8e1b35ffa8 org.eclipse.sisu.inject-0.3.0.M1.tar.bz2
+4afe3fb24ff0d93066b670e288c365b3 org.eclipse.sisu.plexus-0.3.0.M1.tar.bz2
9 years, 3 months
[jsmpp] Initial import (#976051).
by gil
commit b82df687c22ff06936feabf788b16933cc7ecee5
Author: gil <puntogil(a)libero.it>
Date: Tue Feb 3 23:44:34 2015 +0100
Initial import (#976051).
.gitignore | 1 +
jsmpp-2.0.1-test-classpath.patch | 100 ++++++++++++++++++++++++++++++++++
jsmpp-2.1.0-RELEASE.pom | 70 ++++++++++++++++++++++++
jsmpp-osgi.bnd | 9 +++
jsmpp.spec | 111 ++++++++++++++++++++++++++++++++++++++
sources | 1 +
6 files changed, 292 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..bd47aa8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/jsmpp-2.1.0-src.zip
diff --git a/jsmpp-2.0.1-test-classpath.patch b/jsmpp-2.0.1-test-classpath.patch
new file mode 100644
index 0000000..5a00e7d
--- /dev/null
+++ b/jsmpp-2.0.1-test-classpath.patch
@@ -0,0 +1,100 @@
+--- build.xml 2013-06-19 19:18:08.361147225 +0200
++++ build.xml-gil 2013-06-19 19:20:43.330618621 +0200
+@@ -2,11 +2,11 @@
+
+ <property name="src.dir" value="src/java/main" />
+ <property name="src.tests.dir" value="src/java/tests" />
+- <property name="src.examples.dir" value="src/java/examples" />
++ <property name="src.examples.dir" value="src/java/examples" />
+ <property name="classes.dir" value="build/classes" />
+ <property name="tests.dir" value="build/tests" />
+ <property name="examples.dir" value="build/examples" />
+- <property name="javadoc.dir" value="javadoc"/>
++ <property name="javadoc.dir" value="javadoc"/>
+
+ <property name="lib.dir" value="lib" />
+ <property name="project.version" value="2.1.0" />
+@@ -16,25 +16,26 @@
+ <property name="dist.zipall.filename" value="${dist.versionname}-all.zip" />
+ <property name="dist.zipsrc.filename" value="${dist.versionname}-src.zip" />
+ <property name="dist.zipbin.filename" value="${dist.versionname}-bin.zip" />
+- <property name="testng.jar" value="${lib.dir}/testng-5.7-jdk15.jar" />
++ <property name="testng.jar" value="${lib.dir}/testng-5.7-jdk15.jar" />
+
+ <taskdef resource="testngtasks" classpath="${testng.jar}" />
+
+ <path id="compile.path">
+ <pathelement path="${lib.dir}/slf4j-api-1.4.3.jar" />
+- </path>
+-
+- <path id="run.path">
++ </path>
++
++ <path id="run.path">
+ <path refid="compile.path" />
+ <pathelement path="${classes.dir}" />
+- <pathelement path="${lib.dir}/log4j-1.2.14.jar" />
+- <pathelement path="${lib.dir}/slf4j-log4j12-1.4.3.jar" />
+- </path>
++ <pathelement path="${lib.dir}/log4j-1.2.14.jar" />
++ <pathelement path="${lib.dir}/slf4j-log4j12-1.4.3.jar" />
++ </path>
+
+- <path id="test.path">
++ <path id="test.path">
+ <path refid="run.path" />
+- <pathelement path="${testng.jar}" />
+- </path>
++ <pathelement path="${testng.jar}" />
++ <pathelement path="${lib.dir}/beust-jcommander.jar" />
++ </path>
+
+ <path id="run.test.path">
+ <pathelement path="${tests.dir}" />
+@@ -51,12 +52,12 @@
+ <exclude name=".classpath" />
+ <exclude name=".project" />
+ </patternset>
+-
++
+ <target name="clean">
+ <delete dir="${classes.dir}" />
+ <delete dir="${tests.dir}" />
+ <delete dir="${examples.dir}" />
+- </target>
++ </target>
+
+ <target name="prepare">
+ <mkdir dir="${classes.dir}" />
+@@ -75,21 +76,21 @@
+ classpathref="test.path" debug="on"
+ source="1.5" target="1.5"/>
+ </target>
+-
+- <target name="test" depends="compile">
+- <testng classpathref="run.test.path">
+- <xmlfileset file="testng.xml" />
+- </testng>
+- </target>
++
++ <target name="test" depends="compile">
++ <testng classpathref="run.test.path">
++ <xmlfileset file="testng.xml" />
++ </testng>
++ </target>
+
+ <target name="cleantest">
+ <delete dir="test-output"/>
+ </target>
+-
+- <target name="cleanjar">
++
++ <target name="cleanjar">
+ <delete file="${dist.jar.filename}" />
+- <delete file="${dist.examples.jar.filename}" />
+- </target>
++ <delete file="${dist.examples.jar.filename}" />
++ </target>
+
+ <target name="jar" depends="test">
+ <jar destfile="${dist.jar.filename}">
diff --git a/jsmpp-2.1.0-RELEASE.pom b/jsmpp-2.1.0-RELEASE.pom
new file mode 100644
index 0000000..127e1e3
--- /dev/null
+++ b/jsmpp-2.1.0-RELEASE.pom
@@ -0,0 +1,70 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>com.googlecode.jsmpp</groupId>
+ <artifactId>jsmpp</artifactId>
+ <version>2.1.0-RELEASE</version>
+ <packaging>jar</packaging>
+ <name>JSMPP</name>
+ <description>The Java implementation of SMPP protocol (currently supports SMPP v 3.4)</description>
+ <url>http://code.google.com/p/jsmpp/</url>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <scm>
+ <url>http://jsmpp.googlecode.com/svn/trunk/</url>
+ <connection>http://jsmpp.googlecode.com/svn/trunk/</connection>
+ </scm>
+ <developers>
+ <developer>
+ <id>shantanu.kumar</id>
+ <name>Shantanu Kumar</name>
+ <email>kumar.sh...(a)gmail.com</email>
+ </developer>
+ </developers>
+ <dependencies>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.14</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.4.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.4.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <version>5.7</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>sign-artifacts</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <!-- AVOID RELEASE REPOSITORY/PLUGINREPOSITORY: <repositories></repositories> <pluginRepositories></pluginRepositories> -->
+</project>
\ No newline at end of file
diff --git a/jsmpp-osgi.bnd b/jsmpp-osgi.bnd
new file mode 100644
index 0000000..2ed2e24
--- /dev/null
+++ b/jsmpp-osgi.bnd
@@ -0,0 +1,9 @@
+# BND/OSGI Properties by gil
+Built-By: ${user.name}
+Bundle-Description: The Java implementation of SMPP protocol (currently supports SMPP v 3.4)
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-Name: JSMPP
+Bundle-SymbolicName: com.googlecode.jsmpp
+Bundle-Version: @VERSION@
+Export-Package: org.jsmpp.*;version=${Bundle-Version}
+Import-Package: org.testng.*;resolution:=optional,org.slf4j.*,*
diff --git a/jsmpp.spec b/jsmpp.spec
new file mode 100644
index 0000000..55d4217
--- /dev/null
+++ b/jsmpp.spec
@@ -0,0 +1,111 @@
+Name: jsmpp
+Version: 2.1.0
+Release: 1%{?dist}
+Summary: Java SMPP (Short Message Peer-to-peer) API
+License: ASL 2.0
+URL: http://code.google.com/p/jsmpp/
+# migrated to https://github.com/uudashr/jsmpp/
+Source0: http://jsmpp.googlecode.com/files/%{name}-%{version}-src.zip
+Source1: http://repo1.maven.org/maven2/com/googlecode/jsmpp/%{name}/%{version}-REL...
+Source2: %{name}-osgi.bnd
+# add beust-jcommander
+Patch0: %{name}-2.0.1-test-classpath.patch
+
+BuildRequires: ant
+BuildRequires: aqute-bnd
+BuildRequires: java-devel
+BuildRequires: java-javadoc
+BuildRequires: mvn(org.slf4j:slf4j-api)
+BuildRequires: mvn(org.slf4j:slf4j-log4j12)
+# test dep
+BuildRequires: mvn(com.beust:jcommander)
+BuildRequires: mvn(org.testng:testng)
+
+%if %{?fedora} > 20
+BuildRequires: javapackages-local
+BuildRequires: mvn(log4j:log4j:1.2.17)
+Requires: mvn(log4j:log4j:1.2.17)
+%else
+BuildRequires: maven-local
+BuildRequires: mvn(log4j:log4j)
+Requires: mvn(log4j:log4j)
+%endif
+Requires: mvn(org.slf4j:slf4j-api)
+BuildArch: noarch
+
+%description
+The Java implementation of SMPP protocol (currently supports SMPP v 3.4).
+
+%package examples
+Summary: JSMPP examples
+Requires: %{name} = %{version}-%{release}
+
+%description examples
+This package contains %{name} examples.
+
+%package javadoc
+Summary: Javadoc for %{name}
+
+%description javadoc
+This package contains javadoc for %{name}.
+
+%prep
+%setup -q -n %{name}-%{version}
+# cleanup
+find -name "*.jar" -delete
+find -name "*.class" -delete
+find -name "*.bat" -delete
+rm -r javadoc
+
+%patch0 -p0
+
+cp -p %{SOURCE1} pom.xml
+cp -p %{SOURCE2} bnd.properties
+sed -i "s|@VERSION@|%{version}|" bnd.properties
+
+sed -i "s|http://java.sun.com/j2se/1.5.0/docs/api|%{_javadocdir}/java|" build.xml
+
+sed -i.log4j "s|version>1.2.14|version>1.2.17|" pom.xml
+
+%if %{?fedora} > 20
+ln -sf $(build-classpath log4j-1.2.17) lib/log4j-1.2.14.jar
+%else
+ln -sf $(build-classpath log4j) lib/log4j-1.2.14.jar
+%endif
+ln -sf $(build-classpath slf4j/api) lib/slf4j-api-1.4.3.jar
+ln -sf $(build-classpath slf4j/log4j12) lib/slf4j-log4j12-1.4.3.jar
+ln -sf $(build-classpath testng) lib/testng-5.7-jdk15.jar
+ln -sf $(build-classpath beust-jcommander) lib/
+
+%mvn_file : %{name}
+%mvn_alias :%{name} org.apache.servicemix.bundles:org.apache.servicemix.bundles.%{name}
+
+%build
+
+ant jar javadoc
+# required by Apache Camel
+java -jar $(build-classpath aqute-bnd) wrap -properties bnd.properties %{name}-%{version}.jar
+
+mv %{name}-%{version}.bar %{name}-%{version}.jar
+
+%install
+%mvn_artifact pom.xml %{name}-%{version}.jar
+%mvn_install -J javadoc
+
+install -m 644 %{name}-examples.jar %{buildroot}%{_javadir}/
+
+%files -f .mfiles
+%doc CHANGES.txt
+%license LICENSE.txt
+
+%files examples
+%{_javadir}/%{name}-examples.jar
+%doc stress/*
+%license LICENSE.txt
+
+%files javadoc -f .mfiles-javadoc
+%license LICENSE.txt
+
+%changelog
+* Wed Jun 19 2013 gil cattaneo <puntogil(a)libero.it> 2.1.0-1
+- initial rpm
diff --git a/sources b/sources
index e69de29..6908dbd 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+0da38a10570b67eb527a83535774131e jsmpp-2.1.0-src.zip
9 years, 3 months
[objenesis] Add missing BR on maven-wagon-ssh-external
by Mikolaj Izdebski
commit b7a6753675febf40c6113a06300cbaecb9669f3b
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Tue Feb 3 17:45:00 2015 +0100
Add missing BR on maven-wagon-ssh-external
- Resolves: rhbz#1106608
objenesis.spec | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/objenesis.spec b/objenesis.spec
index 33e7940..356bbf4 100644
--- a/objenesis.spec
+++ b/objenesis.spec
@@ -31,7 +31,7 @@
Summary: A library for instantiating Java objects
Name: objenesis
Version: 1.2
-Release: 17%{dist}
+Release: 18%{dist}
Group: Development/Libraries
License: ASL 2.0
URL: http://objenesis.org/
@@ -57,6 +57,7 @@ BuildRequires: maven-timestamp-plugin
BuildRequires: xpp3-minimal
BuildRequires: objectweb-asm
BuildRequires: apache-resource-bundles
+BuildRequires: maven-wagon-ssh-external
BuildArch: noarch
@@ -136,6 +137,10 @@ This package contains the API documentation for %{name}.
%changelog
+* Tue Feb 3 2015 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1.2-18
+- Add missing BR on maven-wagon-ssh-external
+- Resolves: rhbz#1106608
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
9 years, 3 months
[tuscany-sdo-java] add maven-site-plugin as BR
by gil
commit 44a147b68ac6e9013911b30155e362c0f15e9dda
Author: gil <puntogil(a)libero.it>
Date: Tue Feb 3 16:23:41 2015 +0100
add maven-site-plugin as BR
tuscany-sdo-java.spec | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/tuscany-sdo-java.spec b/tuscany-sdo-java.spec
index a413072..a9f90fa 100644
--- a/tuscany-sdo-java.spec
+++ b/tuscany-sdo-java.spec
@@ -5,21 +5,16 @@
Name: tuscany-sdo-java
Version: 1.1.1
-Release: 10%{?dist}
+Release: 11%{?dist}
Summary: Service Data Objects 2.1 Java API spec
License: ASL 2.0
Url: http://tuscany.apache.org/sdo-java.html
Source0: ftp://ftp.gbnet.net/pub/apache/dist/tuscany/java/sdo/%{version}/apache-tu...
-BuildRequires: java-devel
-
BuildRequires: mvn(junit:junit)
-
BuildRequires: maven-local
BuildRequires: maven-assembly-plugin
BuildRequires: maven-plugin-bundle
-BuildRequires: maven-surefire-provider-junit
-
# required by plugin-bundle
BuildRequires: mvn(org.apache.maven.shared:maven-shared-components:pom:)
@@ -47,7 +42,7 @@ This package contains only a Java API of SDO 2.1 spec.
EclipseLink is a implementation of this spec.
%package javadoc
-Summary: Javadocs for %{name}
+Summary: Javadoc for %{name}
%description javadoc
This package contains the API documentation for %{name}.
@@ -77,22 +72,27 @@ sed -i 's/\r//' LICENSE NOTICE README RELEASE_NOTES
sed -i 's#<source>1.4</source>#<source>1.5</source>#' pom.xml sdo-api/pom.xml
sed -i 's#<target>1.4</target>#<target>1.5</target>#' pom.xml sdo-api/pom.xml
-%build
-
%mvn_file :%{api_name} %{name}
%mvn_file :%{api_name} tuscany-sdo-api
+
+%build
+
%mvn_build
%install
%mvn_install
%files -f .mfiles
-%doc LICENSE NOTICE README RELEASE_NOTES
+%doc README RELEASE_NOTES
+%license LICENSE NOTICE
%files javadoc -f .mfiles-javadoc
-%doc LICENSE NOTICE
+%license LICENSE NOTICE
%changelog
+* Tue Feb 03 2015 gil cattaneo <puntogil(a)libero.it> 1.1.1-11
+- introduce license macro
+
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.1.1-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
9 years, 3 months