[jipijapa] update to 1.0.0.Final, re-enable hibernate3 support
gil
gil at fedoraproject.org
Mon Feb 9 17:02:35 UTC 2015
commit 26433b3f9a6c12db76e57ab9addee4574b2d7fac
Author: gil <puntogil at libero.it>
Date: Mon Feb 9 18:02:01 2015 +0100
update to 1.0.0.Final, re-enable hibernate3 support
.gitignore | 1 +
jipijapa.spec | 23 ++++++++++-------------
sources | 2 +-
3 files changed, 12 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 491668c..6a423a4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/1.0.0.Alpha3.tar.gz
/1.0.0.Beta1.tar.gz
/1.0.0.CR1.tar.gz
+/1.0.0.Final.tar.gz
diff --git a/jipijapa.spec b/jipijapa.spec
index 7f087ab..1604dbf 100644
--- a/jipijapa.spec
+++ b/jipijapa.spec
@@ -1,15 +1,12 @@
-%global namedreltag .CR1
+%global namedreltag .Final
%global namedversion %{version}%{?namedreltag}
Name: jipijapa
Version: 1.0.0
-Release: 0.7%{namedreltag}%{?dist}
+Release: 1%{?dist}
Summary: Improve application platform integration with JPA persistence providers
License: ASL 2.0 and LGPLv2+
URL: https://github.com/jipijapa/jipijapa/
Source0: https://github.com/jipijapa/jipijapa/archive/%{namedversion}.tar.gz
-# jipijapa package don't include the license file
-# https://github.com/jipijapa/jipijapa/issues/6
-Source1: http://www.apache.org/licenses/LICENSE-2.0.txt
# SPI module
BuildRequires: mvn(org.hibernate.javax.persistence:hibernate-jpa-2.1-api)
@@ -37,10 +34,11 @@ BuildRequires: mvn(org.hibernate:hibernate-infinispan) >= 4.3.0.Beta2
BuildRequires: mvn(junit:junit)
BuildRequires: mvn(org.jboss.shrinkwrap:shrinkwrap-api)
BuildRequires: mvn(org.jboss.shrinkwrap:shrinkwrap-impl-base)
-%if 0
+
# HIBERNATE 3 module
BuildRequires: hibernate3
BuildRequires: hibernate3-entitymanager
+%if 0
# HIBERNATE 3 dont support infinispan > 5.3.0
BuildRequires: hibernate3-infinispan
# see https://issues.apache.org/jira/browse/OPENJPA-2386
@@ -79,19 +77,15 @@ This package contains javadoc for %{name}.
%pom_remove_dep "org.hibernate:hibernate-commons-annotations" hibernate3/pom.xml
%pom_add_dep "org.hibernate.common:hibernate-commons-annotations" hibernate3/pom.xml
+%pom_remove_dep :hibernate-infinispan hibernate3
# Hibernate 4.1 not available anymore
%pom_disable_module hibernate4_1
# Re-enable when support Java8
%pom_disable_module openjpa
-%pom_disable_module hibernate3
-
%pom_xpath_set "pom:project/pom:properties/pom:version.org.hibernate3" 3
-cp -p %{SOURCE1} .
-sed -i 's/\r//' LICENSE-2.0.txt
-
%build
%mvn_build
@@ -101,12 +95,15 @@ sed -i 's/\r//' LICENSE-2.0.txt
%files -f .mfiles
%dir %{_javadir}/%{name}
%doc README.md
-%license LICENSE-2.0.txt
+%license LICENSE
%files javadoc -f .mfiles-javadoc
-%license LICENSE-2.0.txt
+%license LICENSE
%changelog
+* Mon Feb 09 2015 gil cattaneo <puntogil at libero.it> 1.0.0-1
+- Upstream release 1.0.0.Final
+
* Mon Feb 09 2015 gil cattaneo <puntogil at libero.it> 1.0.0-0.7.CR1
- introduce license macro
- disable OpenJPA support
diff --git a/sources b/sources
index af4a72c..a921e21 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a329ab1cbba5f2ad668292d48d52550b 1.0.0.CR1.tar.gz
+9a691b81aaa38091f8d16d9c123724a2 1.0.0.Final.tar.gz
More information about the scm-commits
mailing list