[tycho] fedoraproject-p2: Fix support for shallow dropin directory layout
by Mikolaj Izdebski
commit a1afbc3d3aea4eabb453352b86f98d085d0d752f
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Thu Feb 5 23:31:37 2015 +0100
fedoraproject-p2: Fix support for shallow dropin directory layout
sources | 2 +-
tycho.spec | 7 +++++--
2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/sources b/sources
index 3adb551..4d3c9d2 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-0c7c5bc738676674028f23bd25824966 fedoraproject-p2-d701d8.tar.xz
+aef02359dcd39227b32b1bb7534b69de fedoraproject-p2-f1bc4c.tar.xz
d7ee912e8da240c8d87892ed876960ae org.eclipse.tycho-tycho-0.22.0.tar.bz2
c600a5115f29962c974b75b4b25e74f1 eclipse-bootstrap.tar.xz
diff --git a/tycho.spec b/tycho.spec
index 5855898..447590c 100644
--- a/tycho.spec
+++ b/tycho.spec
@@ -17,7 +17,7 @@
# %%global snap -SNAPSHOT
%global snap %{nil}
-%global fp_p2_sha d701d8
+%global fp_p2_sha f1bc4c
%global fp_p2_version 0.0.1
%global fp_p2_snap -SNAPSHOT
@@ -25,7 +25,7 @@
Name: %{?scl_prefix}tycho
Version: 0.22.0
-Release: 10%{?dist}
+Release: 11%{?dist}
Summary: Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven
Group: Development/Libraries
@@ -427,6 +427,9 @@ ln -s %{_javadir}/tycho/org.fedoraproject.p2.jar %{buildroot}%{_datadir}/xmvn/li
%{_javadocdir}/tycho
%changelog
+* Thu Feb 5 2015 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0.22.0-11
+- fedoraproject-p2: Fix support for shallow dropin directory layout
+
* Wed Feb 4 2015 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0.22.0-10
- fedoraproject-p2: Bump BREE to JavaSE-1.8
- fedoraproject-p2: Fix installing of virtual bundles provided by p2.inf
9 years, 4 months
[irclib] introduce license macro
by gil
commit 3fb663e7426838b43f28dda44baa3796385e39d2
Author: gil <puntogil(a)libero.it>
Date: Thu Feb 5 16:24:53 2015 +0100
introduce license macro
irclib.spec | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/irclib.spec b/irclib.spec
index 2787d0a..5ff1445 100644
--- a/irclib.spec
+++ b/irclib.spec
@@ -1,12 +1,12 @@
Name: irclib
Version: 1.10
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Java implementation of the IRC protocol
License: ASL 2.0 and EPL and LGPLv2+
URL: http://moepii.sourceforge.net/
Source0: http://prdownloads.sourceforge.net/moepii/%{name}-%{version}.tar.gz
Source1: http://repo2.maven.org/maven2/org/schwering/%{name}/%{version}/%{name}-%{...
-BuildRequires: java-devel
+
%if %{?fedora} >= 21
BuildRequires: javapackages-local
%else
@@ -59,11 +59,15 @@ cd classes
%mvn_install -J docs
%files -f .mfiles
-%doc CHANGELOG COPYING_AL COPYING_EPL COPYING_LGPL README
+%doc CHANGELOG README
+%license COPYING_AL COPYING_EPL COPYING_LGPL
%files javadoc -f .mfiles-javadoc
-%doc COPYING_AL COPYING_EPL COPYING_LGPL
+%license COPYING_AL COPYING_EPL COPYING_LGPL
%changelog
+* Thu Feb 05 2015 gil cattaneo <puntogil(a)libero.it> 1.10-2
+- introduce license macro
+
* Wed Jun 19 2013 gil cattaneo <puntogil(a)libero.it> 1.10-1
- initial rpm
9 years, 4 months
[hsqldb1] introduce license macro
by gil
commit 20cef1fff85587735382f865ca7e17ce3b23d96f
Author: gil <puntogil(a)libero.it>
Date: Thu Feb 5 15:30:00 2015 +0100
introduce license macro
hsqldb1.spec | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/hsqldb1.spec b/hsqldb1.spec
index 06c2de6..89e8fa3 100644
--- a/hsqldb1.spec
+++ b/hsqldb1.spec
@@ -3,7 +3,7 @@
%global majorversion 1
Name: hsqldb1
Version: 1.8.1.3
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: HyperSQL Database Engine
License: BSD
URL: http://hsqldb.sourceforge.net/
@@ -82,13 +82,16 @@ mkdir -p %{buildroot}%{_javadocdir}/%{name}
cp -r doc/src/* %{buildroot}%{_javadocdir}/%{name}
%files -f .mfiles
-%doc doc/hsqldb_lic.txt
+%license doc/hsqldb_lic.txt
%files javadoc
%{_javadocdir}/%{name}
-%doc doc/hsqldb_lic.txt
+%license doc/hsqldb_lic.txt
%changelog
+* Thu Feb 05 2015 gil cattaneo <puntogil(a)libero.it> 1.8.1.3-5
+- introduce license macro
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.8.1.3-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
@@ -99,4 +102,4 @@ cp -r doc/src/* %{buildroot}%{_javadocdir}/%{name}
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
* Tue Jun 04 2013 gil cattaneo <puntogil(a)libero.it> 1.8.1.3-1
-- initial rpm
\ No newline at end of file
+- initial rpm
9 years, 4 months
[hppc] introduce license macro
by gil
commit eb74cf04a1980c46755e337b3b4469b72cc20ab1
Author: gil <puntogil(a)libero.it>
Date: Thu Feb 5 15:24:15 2015 +0100
introduce license macro
hppc.spec | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
---
diff --git a/hppc.spec b/hppc.spec
index b8198a8..e8d6521 100644
--- a/hppc.spec
+++ b/hppc.spec
@@ -1,6 +1,6 @@
Name: hppc
Version: 0.6.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: High Performance Primitive Collections for Java
License: ASL 2.0
URL: http://labs.carrotsearch.com/hppc.html
@@ -16,7 +16,6 @@ BuildRequires: mvn(org.sonatype.oss:oss-parent:pom:)
%if 0
# hppc-benchmarks deps
# http://gil.fedorapeople.org/caliper-1.0-0.1.20120909SNAPSHOT.fc16.src.rpm
-# http://gil.fedorapeople.org/caliper.spec
BuildRequires: mvn(com.google.caliper:caliper:0.5-rc1)
BuildRequires: mvn(com.google.code.gson:gson)
BuildRequires: mvn(com.h2database:h2)
@@ -24,7 +23,6 @@ BuildRequires: mvn(commons-io:commons-io)
BuildRequires: mvn(commons-lang:commons-lang)
BuildRequires: mvn(it.unimi.dsi:fastutil)
# http://gil.fedorapeople.org/trove-3.0.3-1.fc16.src.rpm
-# http://gil.fedorapeople.org/trove.spec
BuildRequires: mvn(net.sf.trove4j:trove4j:3.0.3)
BuildRequires: mvn(org.apache.mahout:mahout-collections)
@@ -93,11 +91,12 @@ find . -name "*.jar" -print -delete
sed -i 's/\r//' CHANGES
-%build
-
%mvn_file :%{name} %{name}
%mvn_file :%{name}-templateprocessor %{name}-templateprocessor
%mvn_package :%{name}-templateprocessor %{name}-templateprocessor
+
+%build
+
# Disable test for now. Unavailable test deps
%mvn_build -f
@@ -105,15 +104,19 @@ sed -i 's/\r//' CHANGES
%mvn_install
%files -f .mfiles
-%doc CHANGES LICENSE README
+%doc CHANGES README
+%license LICENSE
%files templateprocessor -f .mfiles-%{name}-templateprocessor
-%doc LICENSE
+%license LICENSE
%files javadoc -f .mfiles-javadoc
-%doc LICENSE
+%license LICENSE
%changelog
+* Thu Feb 05 2015 gil cattaneo <puntogil(a)libero.it> 0.6.1-2
+- introduce license macro
+
* Wed Dec 17 2014 gil cattaneo <puntogil(a)libero.it> 0.6.1-1
- update to 0.6.1
9 years, 4 months
[howl-logger] introduce license macro
by gil
commit c8845e3eecf77ebb20c3da4ed54de98703d1a40e
Author: gil <puntogil(a)libero.it>
Date: Thu Feb 5 15:08:49 2015 +0100
introduce license macro
howl-logger.spec | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
---
diff --git a/howl-logger.spec b/howl-logger.spec
index 14eb73d..374f84e 100644
--- a/howl-logger.spec
+++ b/howl-logger.spec
@@ -1,19 +1,17 @@
Name: howl-logger
Version: 1.0.2
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: High-speed ObjectWeb Logger
License: BSD
URL: http://forge.ow2.org/projects/howl/
# svn export svn://svn.forge.objectweb.org/svnroot/howl/tags/HOWL_1_0_2/howl/logger/ howl-logger-1.0.2
# tar czf howl-logger-1.0.2-src-svn.tar.gz howl-logger-1.0.2
Source0: %{name}-%{version}-src-svn.tar.gz
-BuildRequires: java-devel
# test deps
BuildRequires: mvn(junit:junit)
BuildRequires: maven-local
-BuildRequires: maven-surefire-provider-junit
BuildArch: noarch
@@ -47,22 +45,26 @@ sed -i "s|junit.textui.TestRunner.run(LogTest.class);|//junit.textui.TestRunner.
src/test/org/objectweb/howl/log/allTest.java \
src/test/org/objectweb/howl/log/ExceptionTest.java
-%build
-
%mvn_file :howl %{name} howl
%mvn_alias :howl "howl:%{name}"
+
+%build
+
%mvn_build -- -Dproject.build.sourceEncoding=UTF-8
%install
%mvn_install
%files -f .mfiles
-%doc LICENSE.txt
+%license LICENSE.txt
%files javadoc -f .mfiles-javadoc
-%doc LICENSE.txt
+%license LICENSE.txt
%changelog
+* Thu Feb 05 2015 gil cattaneo <puntogil(a)libero.it> 1.0.2-4
+- introduce license macro
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.0.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
@@ -70,4 +72,4 @@ sed -i "s|junit.textui.TestRunner.run(LogTest.class);|//junit.textui.TestRunner.
- Use Requires: java-headless rebuild (#1067528)
* Fri Aug 31 2012 gil cattaneo <puntogil(a)libero.it> 1.0.2-1
-- initial rpm
\ No newline at end of file
+- initial rpm
9 years, 4 months
[high-scale-lib] introduce license macro
by gil
commit 701f63c2512bade28cd8affa35b05847799a8d1c
Author: gil <puntogil(a)libero.it>
Date: Thu Feb 5 15:05:55 2015 +0100
introduce license macro
high-scale-lib.spec | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
---
diff --git a/high-scale-lib.spec b/high-scale-lib.spec
index 9736d6a..9cc4425 100644
--- a/high-scale-lib.spec
+++ b/high-scale-lib.spec
@@ -1,6 +1,6 @@
Name: high-scale-lib
Version: 1.1.4
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: A collection of Concurrent and Highly Scalable Utilities
# Might want to address with upstream to adjust because
# http://creativecommons.org/licenses/publicdomain/
@@ -11,11 +11,8 @@ License: Public Domain
URL: https://github.com/stephenc/high-scale-lib/
Source0: https://github.com/stephenc/high-scale-lib/archive/%{name}-parent-%{versi...
-BuildRequires: java-devel
-
BuildRequires: maven-local
BuildRequires: maven-enforcer-plugin
-BuildRequires: maven-surefire-provider-junit
BuildArch: noarch
@@ -52,12 +49,16 @@ sed -i 's/\r//' README
%files -f .mfiles
%dir %{_javadir}/%{name}
-%doc LICENSE README
+%doc README
+%license LICENSE
%files javadoc -f .mfiles-javadoc
-%doc LICENSE
+%license LICENSE
%changelog
+* Thu Feb 05 2015 gil cattaneo <puntogil(a)libero.it> 1.1.4-4
+- introduce license macro
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.1.4-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
@@ -65,4 +66,4 @@ sed -i 's/\r//' README
- Use Requires: java-headless rebuild (#1067528)
* Wed Aug 14 2013 gil cattaneo <puntogil(a)libero.it> 1.1.4-1
-- initial rpm
\ No newline at end of file
+- initial rpm
9 years, 4 months
[hibernate] fix jandex1.2.2
by gil
commit 1394fab2d5893a245223e9a43e2671951d68e481
Author: gil <puntogil(a)libero.it>
Date: Thu Feb 5 15:02:59 2015 +0100
fix jandex1.2.2
hibernate.spec | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --git a/hibernate.spec b/hibernate.spec
index a39cacc..c4701ea 100644
--- a/hibernate.spec
+++ b/hibernate.spec
@@ -388,6 +388,9 @@ for f in $(grep -e 'Pedersen\|Lichtmaier\|Chanfreau\|Benke\|Carlos\|CREATE\ SCHE
native2ascii -encoding UTF8 ${f} ${f}
done
+sed -i.jandex1.2.2 "s|classDotName, superName, access_flag, interfaces, map|classDotName, superName, access_flag, interfaces, map, true|" \
+ hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/IndexBuilder.java
+
%build
# Disabled beacuse of cyclic dep between core and testing modules
%mvn_build -s -f -- -Dproject.build.sourceEncoding=UTF-8
9 years, 4 months
[hibernate-jpamodelgen] introduce license macro
by gil
commit b725d7be7192ac47a8a11ed53932369ea9ce6d66
Author: gil <puntogil(a)libero.it>
Date: Thu Feb 5 14:42:24 2015 +0100
introduce license macro
hibernate-jpamodelgen.spec | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/hibernate-jpamodelgen.spec b/hibernate-jpamodelgen.spec
index 647c17d..528f16f 100644
--- a/hibernate-jpamodelgen.spec
+++ b/hibernate-jpamodelgen.spec
@@ -3,14 +3,12 @@
%global with_test 0
Name: hibernate-jpamodelgen
Version: 1.2.0
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: Hibernate JPA 2 Metamodel Generator
License: ASL 2.0
Url: http://www.hibernate.org/subprojects/jpamodelgen.html
Source0: http://sourceforge.net/projects/hibernate/files/%{name}/%{namedversion}/%...
-BuildRequires: java-devel
-
%if %with_test
BuildRequires: hibernate >= 4.0.0
BuildRequires: hibernate-jpa-2.0-api
@@ -48,9 +46,10 @@ rm -rf docs/api
%pom_remove_plugin :maven-surefire-plugin
%endif
+%mvn_file :%{name} %{name}
+
%build
-%mvn_file :%{name} %{name}
# test skip unavailable deps
%mvn_build \
%if !%with_test
@@ -62,12 +61,16 @@ rm -rf docs/api
%mvn_install
%files -f .mfiles
-%doc README.md changelog.txt license.txt
+%doc README.md changelog.txt
+%license license.txt
%files javadoc -f .mfiles-javadoc
-%doc license.txt
+%license license.txt
%changelog
+* Thu Feb 05 2015 gil cattaneo <puntogil(a)libero.it> 1.2.0-9
+- introduce license macro
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.0-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
9 years, 4 months