[mockito] More Import-Package fixes.
by jerboaa
Summary of changes:
e9c09a7... More Import-Package fixes. (*)
(*) This commit already existed in another branch; no separate mail sent
11 years, 8 months
[mockito/f18] More Import-Package fixes.
by jerboaa
commit e9c09a7dd77aa758d806157c8515388d995c79df
Author: Severin Gehwolf <sgehwolf(a)redhat.com>
Date: Thu Sep 6 15:24:23 2012 +0200
More Import-Package fixes.
Note that fix-cglib-refs.patch is not suitable for upstream:
http://code.google.com/p/mockito/issues/detail?id=373
fix-bnd-config.patch | 6 +++---
make-mockito-sourcetarball.sh | 1 +
mockito.spec | 7 ++++++-
sources | 2 +-
4 files changed, 11 insertions(+), 5 deletions(-)
---
diff --git a/fix-bnd-config.patch b/fix-bnd-config.patch
index fe41f2f..b9eceae 100644
--- a/fix-bnd-config.patch
+++ b/fix-bnd-config.patch
@@ -1,5 +1,5 @@
---- conf/mockito-core.bnd.orig 2012-09-04 15:08:36.953346883 +0200
-+++ conf/mockito-core.bnd 2012-09-04 15:09:49.221919598 +0200
+--- conf/mockito-core.bnd.orig 2012-09-06 14:42:08.417103606 +0200
++++ conf/mockito-core.bnd 2012-09-06 14:43:41.391834567 +0200
@@ -1,8 +1,3 @@
--classpath= lib/run/com.springsource.org.junit-4.5.0.jar, \
- lib/run/com.springsource.org.hamcrest.core-1.1.0.jar, \
@@ -23,7 +23,7 @@
org.objenesis;version="[1.0,2.0)", \
- org.mockito.*
+ org.mockito.*, \
-+ net.sf.cglib.proxy
++ net.sf.cglib*
Private-Package: org.mockito.*
diff --git a/make-mockito-sourcetarball.sh b/make-mockito-sourcetarball.sh
index 224d629..58c1b67 100644
--- a/make-mockito-sourcetarball.sh
+++ b/make-mockito-sourcetarball.sh
@@ -1,4 +1,5 @@
#!/bin/sh
+#set -x
VERSION=1.9.0
SRCDIR=mockito-${VERSION}
diff --git a/mockito.spec b/mockito.spec
index df1b13b..5b4cb89 100644
--- a/mockito.spec
+++ b/mockito.spec
@@ -1,6 +1,6 @@
Name: mockito
Version: 1.9.0
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: A Java mocking framework
License: MIT
@@ -86,6 +86,11 @@ cp -rp target/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%doc NOTICE
%changelog
+* Thu Sep 6 2012 Severin Gehwolf <sgehwolf(a)redhat.com> 1.9.0-10
+- More Import-Package fixes. Note that fix-cglib-refs.patch is
+ not suitable for upstream:
+ http://code.google.com/p/mockito/issues/detail?id=373
+
* Tue Sep 4 2012 Severin Gehwolf <sgehwolf(a)redhat.com> 1.9.0-9
- Fix missing Import-Package in manifest.
diff --git a/sources b/sources
index 3d148e8..f6b13f3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1c8f7d570579d7fbaa2a45fdeaf3e3e1 mockito-1.9.0.tar.xz
+967d7b4059fa8185b94d6f7273f6cfe5 mockito-1.9.0.tar.xz
11 years, 8 months
[maven-plugin-tools/f18] Rename javadocs subpackage to javadoc
by Mikolaj Izdebski
commit 8c98047dc072243160b220065dded46375057112
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Thu Sep 6 11:56:19 2012 +0200
Rename javadocs subpackage to javadoc
- Remove rpm bug workaround
maven-plugin-tools.spec | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
---
diff --git a/maven-plugin-tools.spec b/maven-plugin-tools.spec
index 9c519bf..e5010a6 100644
--- a/maven-plugin-tools.spec
+++ b/maven-plugin-tools.spec
@@ -1,6 +1,6 @@
Name: maven-plugin-tools
Version: 2.7
-Release: 6%{?dist}
+Release: 7%{?dist}
Epoch: 0
Summary: Maven Plugin Tools
@@ -43,12 +43,14 @@ Requires: java
The Maven Plugin Tools contains the necessary tools to be able to produce Maven
Plugins in a variety of languages.
-%package javadocs
+%package javadoc
Group: Documentation
Summary: Javadoc for %{name}
Requires: jpackage-utils
+Obsoletes: %{name}-javadocs < 0:%{version}-%{release}
+Provides: %{name}-javadocs = 0:%{version}-%{release}
-%description javadocs
+%description javadoc
API documentation for %{name}.
%package ant
@@ -207,17 +209,12 @@ install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
-%pre javadoc
-# workaround for rpm bug, can be removed in F-17
-[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
-rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
-
%files
%doc LICENSE NOTICE
%{_mavenpomdir}/JPP.%{name}-%{name}.pom
%{_mavendepmapfragdir}/%{name}
-%files javadocs
+%files javadoc
%doc LICENSE NOTICE
%{_javadocdir}/%{name}
@@ -257,6 +254,10 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%{_mavendepmapfragdir}/maven-plugin-plugin
%changelog
+* Thu Sep 6 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0:2.7-7
+- Rename javadocs subpackage to javadoc
+- Remove rpm bug workaround
+
* Tue Aug 28 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0:2.7-6
- Wrap descriptions at column 80
- Install LICENSE and NOTICE files
11 years, 8 months
[hawtbuf] Initial import (#853050).
by gil
commit 7b780351d640027d5783266e8f18069675a2c6e0
Author: gil <puntogil(a)libero.it>
Date: Wed Sep 5 17:32:36 2012 +0200
Initial import (#853050).
.gitignore | 1 +
hawtbuf.spec | 133 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
sources | 1 +
3 files changed, 135 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..60e8316 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/hawtbuf-1.9.tar.xz
diff --git a/hawtbuf.spec b/hawtbuf.spec
new file mode 100644
index 0000000..19a3cab
--- /dev/null
+++ b/hawtbuf.spec
@@ -0,0 +1,133 @@
+Name: hawtbuf
+Version: 1.9
+Release: 2%{?dist}
+Summary: A rich byte buffer library
+Group: Development/Libraries
+License: ASL 2.0
+URL: https://github.com/fusesource/hawtbuf/
+# git clone git://github.com/fusesource/hawtbuf.git hawtbuf-1.9
+# cd hawtbuf-1.9/ && git archive --format=tar --prefix=hawtbuf-1.9/ hawtbuf-project-1.9 | xz > hawtbuf-1.9.tar.xz
+Source0: hawtbuf-%{version}.tar.xz
+BuildRequires: fusesource-pom
+BuildRequires: java-devel
+BuildRequires: jpackage-utils
+
+BuildRequires: apache-commons-logging
+
+# test deps
+BuildRequires: junit
+BuildRequires: log4j
+
+BuildRequires: maven
+BuildRequires: javacc-maven-plugin
+BuildRequires: maven-compiler-plugin
+BuildRequires: maven-install-plugin
+BuildRequires: maven-invoker-plugin
+BuildRequires: maven-jar-plugin
+BuildRequires: maven-javadoc-plugin
+BuildRequires: maven-plugin-bundle
+BuildRequires: maven-plugin-plugin
+BuildRequires: maven-resources-plugin
+BuildRequires: maven-surefire-plugin
+BuildRequires: maven-surefire-provider-junit4
+
+Requires: apache-commons-logging
+
+Requires: java
+Requires: jpackage-utils
+BuildArch: noarch
+
+%description
+This library implements a simple interface with working with
+byte arrays. It is a shame that the Java SDK did not come with
+a built in class that was just simply a byte[], int offset,
+int length class which provided a rich interface similar to
+what the String class does for char arrays. This library
+fills in that void by providing a Buffer class which does provide
+that rich interface.
+
+%package proto
+Group: Development/Libraries
+Summary: A protobuf library
+Requires: %{name} = %{version}-%{release}
+
+%description proto
+HawtBuf Proto: A protobuf library.
+
+%package protoc
+Group: Development/Libraries
+Summary: A protobuf compiler as a maven plugin
+Requires: %{name}-proto = %{version}-%{release}
+Requires: maven
+
+%description protoc
+HawtBuf Protoc: A protobuf compiler as a maven plugin.
+
+%package javadoc
+Group: Documentation
+Summary: Javadoc for %{name}
+Requires: jpackage-utils
+
+%description javadoc
+This package contains javadoc for %{name}.
+
+%prep
+%setup -q
+%pom_remove_plugin org.apache.maven.plugins:maven-assembly-plugin
+
+%build
+
+mvn-rpmbuild -Prun-its install javadoc:aggregate
+
+%install
+
+mkdir -p %{buildroot}%{_mavenpomdir}
+install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-project.pom
+%add_maven_depmap JPP.%{name}-project.pom
+
+mkdir -p %{buildroot}%{_javadir}/%{name}
+install -m 644 %{name}/target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}.jar
+install -pm 644 %{name}/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}.pom
+%add_maven_depmap JPP.%{name}-%{name}.pom %{name}/%{name}.jar
+
+for m in \
+ proto \
+ protoc;do
+ install -m 644 %{name}-${m}/target/%{name}-${m}-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}-${m}.jar
+ install -pm 644 %{name}-${m}/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}-${m}.pom
+ %add_maven_depmap -f ${m} JPP.%{name}-%{name}-${m}.pom %{name}/%{name}-${m}.jar
+done
+
+mkdir -p %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
+
+%files
+%{_javadir}/%{name}/%{name}.jar
+%{_mavenpomdir}/JPP.%{name}-project.pom
+%{_mavenpomdir}/JPP.%{name}-%{name}.pom
+%{_mavendepmapfragdir}/%{name}
+%doc license.txt notice.md readme.md
+
+%files proto
+%{_javadir}/%{name}/%{name}-proto.jar
+%{_mavenpomdir}/JPP.%{name}-%{name}-proto.pom
+%{_mavendepmapfragdir}/%{name}-proto
+%doc license.txt notice.md %{name}-proto/readme.md
+
+%files protoc
+%{_javadir}/%{name}/%{name}-protoc.jar
+%{_mavenpomdir}/JPP.%{name}-%{name}-protoc.pom
+%{_mavendepmapfragdir}/%{name}-protoc
+%doc license.txt notice.md %{name}-protoc/readme.md
+
+%files javadoc
+%{_javadocdir}/%{name}
+%doc license.txt notice.md
+
+%changelog
+* Wed Sep 05 2012 gil cattaneo <puntogil(a)libero.it> 1.9-2
+- removed hawtbuf-tests.jar
+- performed integration test
+
+* Tue May 22 2012 gil cattaneo <puntogil(a)libero.it> 1.9-1
+- initial rpm
\ No newline at end of file
diff --git a/sources b/sources
index e69de29..c52abe3 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+baf514c2e9c636c805b76408ec11b0fb hawtbuf-1.9.tar.xz
11 years, 8 months
