[maven-surefire/f19] Remove unnecessary dependency on mockito
by Michal Srb
commit 144d1f99482016f1e46e161decf33d5c3ff59cbc
Author: Michal Srb <msrb(a)redhat.com>
Date: Fri Apr 5 15:57:28 2013 +0200
Remove unnecessary dependency on mockito
maven-surefire.spec | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/maven-surefire.spec b/maven-surefire.spec
index 0d6ab8d..6ac134e 100644
--- a/maven-surefire.spec
+++ b/maven-surefire.spec
@@ -1,6 +1,6 @@
Name: maven-surefire
Version: 2.14
-Release: 2%{?dist}
+Release: 3%{?dist}
Epoch: 0
Summary: Test framework project
License: ASL 2.0 and CPL
@@ -18,7 +18,6 @@ BuildRequires: junit >= 3.8.2
BuildRequires: plexus-utils
BuildRequires: junit4
BuildRequires: testng
-BuildRequires: mockito
BuildRequires: maven-local
BuildRequires: maven-compiler-plugin
@@ -166,6 +165,9 @@ done
%doc LICENSE NOTICE cpl-v10.html
%changelog
+* Fri Apr 05 2013 Michal Srb <msrb(a)redhat.com> - 0:2.14-3
+- Remove unnecessary dependency on mockito
+
* Fri Mar 15 2013 Michal Srb <msrb(a)redhat.com> - 0:2.14-2
- Remove unneeded dependencies
11 years
[javapackages] [doc] Small random fixes
by Mikolaj Izdebski
commit 2ce7faee7d2916f2d2a4e0e40c9cbe81b8880b01
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Fri Apr 5 14:49:22 2013 +0200
[doc] Small random fixes
doc/helper_macros.txt | 2 +-
doc/index.txt | 1 +
2 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/doc/helper_macros.txt b/doc/helper_macros.txt
index 960b357..d54c6f5 100644
--- a/doc/helper_macros.txt
+++ b/doc/helper_macros.txt
@@ -64,7 +64,7 @@ The above macros cover the most common cases of modifying `pom.xml` files,
however if there is a need to apply some less-common patches there are also two
generic macros for modifying `pom.xml` files. `%pom_xpath_remove` can be used to
remove arbitrary XML nodes, described by link:http://www.w3.org/TR/xpath/[XPath]
-expressions. `%pom_xpath_inject` macro is capable of injecting arbitrary
+1.0 expressions. `%pom_xpath_inject` macro is capable of injecting arbitrary
link:http://www.w3.org/TR/xml/[XML] code to any `pom.xml` file. Below you can find
some examples for these macros.
diff --git a/doc/index.txt b/doc/index.txt
index e14b92b..13de26f 100644
--- a/doc/index.txt
+++ b/doc/index.txt
@@ -26,6 +26,7 @@ will cover basic packaging principles such as:
* No bundling
* Working with upstreams
* Commenting workarounds
+ * Single library version
* Links to other appropriate documents
[[helper_macros]]
11 years
[sat4j] Update to 2.3.3 Initial sclization.
by Krzysztof Daniel
commit 7ec29481aa84e751d5ab65b4d4458430e68eb6e6
Author: Krzysztof Daniel <kdaniel(a)redhat.com>
Date: Fri Apr 5 09:13:32 2013 +0200
Update to 2.3.3
Initial sclization.
.gitignore | 3 +++
sat4j-classpath.patch | 2 +-
sat4j-fetch.sh | 4 ++--
sat4j.spec | 30 ++++++++++++++++++------------
sources | 2 +-
5 files changed, 25 insertions(+), 16 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ca4f871..60a6884 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,6 @@ sat4j-2.1.1.tar.bz2
sat4j-2.1.1.tar.lzma
sat4j-2.2.0.tar.xz
sat4j-2.3.0.tar.xz
+/sat4j-2.3.3.tar.xz
+/noarch
+/sat4j-2.3.3
diff --git a/sat4j-classpath.patch b/sat4j-classpath.patch
index 681b7ad..219bd88 100644
--- a/sat4j-classpath.patch
+++ b/sat4j-classpath.patch
@@ -5,4 +5,4 @@
Implementation-Version: 9.9.9.token
Implementation-Vendor: CRIL CNRS UMR 8188 - Universite d'Artois
-Class-Path: org.sat4j.core.jar
- Bundle-RequiredExecutionEnvironment: J2SE-1.4
+ Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/sat4j-fetch.sh b/sat4j-fetch.sh
old mode 100644
new mode 100755
index faf336e..619934c
--- a/sat4j-fetch.sh
+++ b/sat4j-fetch.sh
@@ -1,7 +1,7 @@
#!/bin/sh
name=sat4j
-tag=org.sat4j.pom-2.3.0
-version=2.3.0
+tag=org.sat4j.pom-2.3.3
+version=2.3.3
tar_name=$name-$version
rm -fr $tar_name && mkdir $tar_name
diff --git a/sat4j.spec b/sat4j.spec
index 8a123f0..1e4b2af 100644
--- a/sat4j.spec
+++ b/sat4j.spec
@@ -1,26 +1,28 @@
+%{?scl:%scl_package sat4j}
+%{!?scl:%global pkg_name %{name}}
+
%global eclipse_base %{_libdir}/eclipse
-# We want the version to match that shipped in Eclipse's Orbit project
-%global qualifier 20100429
-Name: sat4j
-Version: 2.3.0
-Release: 5%{?dist}
+Name: %{?scl_prefix}sat4j
+Version: 2.3.3
+Release: 6%{?dist}
Summary: A library of SAT solvers written in Java
Group: Development/Libraries
License: EPL or LGPLv2
URL: http://www.sat4j.org/
-# Created by sh %{name}-fetch.sh
-Source0: %{name}-%{version}.tar.xz
-Source1: %{name}-fetch.sh
-Patch0: %{name}-classpath.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# Created by sh %{pkg_name}-fetch.sh
+Source0: %{pkg_name}-%{version}.tar.xz
+Source1: %{pkg_name}-fetch.sh
+Patch0: %{pkg_name}-classpath.patch
+BuildRoot: %{_tmppath}/%{pkg_name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: java-devel >= 1:1.6
BuildRequires: ant
BuildRequires: ecj
Requires: java >= 1:1.6
Requires: jpackage-utils
+%{?scl:Requires: %scl_runtime}
BuildArch: noarch
@@ -31,14 +33,14 @@ boxes", those willing to embed SAT technologies into their application
without worrying about the details.
%prep
-%setup -q
+%setup -q -n %{pkg_name}-%{version}
%patch0
# Only used for the tests
rm lib/commons-cli.jar
%build
-ant -Dbuild.compiler=modern -Drelease=%{version} -DBUILD_DATE=%{qualifier} -Dtarget=1.5 p2
+ant -Dbuild.compiler=modern -Drelease=%{version} -Dtarget=1.5 p2
%install
rm -rf $RPM_BUILD_ROOT
@@ -57,6 +59,10 @@ rm -rf $RPM_BUILD_ROOT
%{_javadir}/org.sat4j*
%changelog
+* Fri Apr 5 2013 Krzysztof Daniel <kdaniel(a)redhat.com> 2.3.0-6
+- Update to 2.3.3
+- Initial sclization.
+
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.3.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
diff --git a/sources b/sources
index 7ceda3d..3af44e1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-aacb839425184b8059d8471083558960 sat4j-2.3.0.tar.xz
+438fa0db70fd60f942da8dc8baa78571 sat4j-2.3.3.tar.xz
11 years
[apache-commons-daemon] Bump release number
by Mikolaj Izdebski
commit 359c67dd6089e14b09fc450798d9feb3059bbbde
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Fri Apr 5 05:20:07 2013 +0200
Bump release number
apache-commons-daemon.spec | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --git a/apache-commons-daemon.spec b/apache-commons-daemon.spec
index c94b6c0..c9ea17c 100644
--- a/apache-commons-daemon.spec
+++ b/apache-commons-daemon.spec
@@ -107,6 +107,9 @@ install -Dpm 644 src/native/unix/jsvc.1 $RPM_BUILD_ROOT%{_mandir}/man1/jsvc.1
%changelog
+* Fri Apr 5 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1.0.15-2
+- Bump release number
+
* Fri Apr 5 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1.0.15-1
- Update to upstream version 1.0.15
- Remove 0001-execve-path-warning.patch (fixed upstream)
11 years
[apache-commons-daemon] Update to upstream version 1.0.15
by Mikolaj Izdebski
commit 0c82b124701e41bce7e0b4313503ace6f2a55934
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Fri Apr 5 04:42:04 2013 +0200
Update to upstream version 1.0.15
.gitignore | 1 +
0001-execve-path-warning.patch | 32 --------------------------------
apache-commons-daemon-ppc64.patch | 24 ------------------------
apache-commons-daemon-s390x.patch | 28 ----------------------------
apache-commons-daemon.spec | 15 +++++++--------
sources | 2 +-
6 files changed, 9 insertions(+), 93 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8af977e..ee935d5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ commons-daemon-1.0.2-src.tar.gz
/commons-daemon-1.0.11-src.tar.gz
/commons-daemon-1.0.12-src.tar.gz
/commons-daemon-1.0.13-src.tar.gz
+/commons-daemon-1.0.15-src.tar.gz
diff --git a/apache-commons-daemon.spec b/apache-commons-daemon.spec
index 76f3f76..c94b6c0 100644
--- a/apache-commons-daemon.spec
+++ b/apache-commons-daemon.spec
@@ -3,17 +3,14 @@
%global short_name commons-%{base_name}
Name: apache-%{short_name}
-Version: 1.0.13
-Release: 1%{?dist}
+Version: 1.0.15
+Release: 2%{?dist}
Summary: Defines API to support an alternative invocation mechanism
License: ASL 2.0
Group: Applications/System
URL: http://commons.apache.org/%{base_name}
Source0: http://archive.apache.org/dist/commons/%{base_name}/source/%{short_name}-...
-Patch0: 0001-execve-path-warning.patch
Patch1: apache-commons-daemon-JAVA_OS.patch
-Patch2: apache-commons-daemon-s390x.patch
-Patch3: apache-commons-daemon-ppc64.patch
BuildRequires: maven-local
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: jpackage-utils
@@ -60,10 +57,7 @@ Obsoletes: jakarta-%{short_name}-javadoc <= 1:1.0.1
%prep
%setup -q -n %{short_name}-%{version}-src
-%patch0 -p1 -b .execve
%patch1 -p1 -b .java_os
-%patch2 -p1 -b .s390x
-%patch3 -p1 -b .ppc64
# remove java binaries from sources
rm -rf src/samples/build/
@@ -113,6 +107,11 @@ install -Dpm 644 src/native/unix/jsvc.1 $RPM_BUILD_ROOT%{_mandir}/man1/jsvc.1
%changelog
+* Fri Apr 5 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1.0.15-1
+- Update to upstream version 1.0.15
+- Remove 0001-execve-path-warning.patch (fixed upstream)
+- Remove patches for s390x and ppc64 (accepted upstream in DAEMON-289)
+
* Wed Feb 13 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1.0.13-1
- Update to upstream version 1.0.13
diff --git a/sources b/sources
index 51ae1b7..9277777 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-abf519e43e95e8b1f63a45e2568374d6 commons-daemon-1.0.13-src.tar.gz
+e467bc1f332d47ad85d18ea8b8a897c3 commons-daemon-1.0.15-src.tar.gz
11 years