[quartz/f19] fix c3p0 gId

[gil]

commit 340fe8c53799c5188c2e6e1357e5fd956ea446fb
Author: gil <puntogil at libero.it>
Date:   Mon Aug 19 17:37:49 2013 +0200

    fix c3p0 gId

 quartz-2.1.2-dep-fixes.patch |  108 ------------------------------------------
 quartz.spec                  |   80 ++++++++++++-------------------
 2 files changed, 32 insertions(+), 156 deletions(-)
---
diff --git a/quartz.spec b/quartz.spec
index fd35a40..068e9d6 100644
--- a/quartz.spec
+++ b/quartz.spec
@@ -1,16 +1,14 @@
 Summary:        Enterprise Job Scheduler for Java
 Name:           quartz
 Version:        2.1.2
-Release:        7%{?dist}
+Release:        8%{?dist}
 Epoch:          0
 License:        ASL 2.0
 URL:            http://www.quartz-scheduler.org/
-Group:          Development/Libraries
 # svn export http://svn.terracotta.org/svn/quartz/tags/quartz-2.1.2
 # tar caf quartz-2.1.2.tar.xz quartz-2.1.2
 Source0:        %{name}-%{version}.tar.xz
-Patch0:         %{name}-%{version}-dep-fixes.patch
-BuildRequires:  jpackage-utils >= 0:1.7.3
+
 BuildRequires:  java-devel >= 0:1.5.0
 BuildRequires:  geronimo-parent-poms
 BuildRequires:  maven-local
@@ -18,13 +16,7 @@ BuildRequires:  maven-shared
 BuildRequires:  maven-dependency-plugin
 BuildRequires:  maven-clean-plugin
 BuildRequires:  maven-pmd-plugin
-BuildRequires:  maven-compiler-plugin
-BuildRequires:  maven-install-plugin
-BuildRequires:  maven-jar-plugin
-BuildRequires:  maven-javadoc-plugin
 BuildRequires:  maven-release-plugin
-BuildRequires:  maven-resources-plugin
-BuildRequires:  maven-surefire-plugin
 BuildRequires:  maven-enforcer-plugin
 BuildRequires:  rmic-maven-plugin
 BuildRequires:  junit
@@ -43,9 +35,8 @@ BuildRequires:  jms
 BuildRequires:  jta
 BuildRequires:  log4j
 BuildRequires:  servlet >= 2.5
+BuildRequires:  slf4j
 
-Requires:  jpackage-utils
-Requires:  java >= 0:1.5.0
 Requires:  apache-commons-beanutils
 Requires:  apache-commons-collections
 Requires:  apache-commons-dbcp
@@ -54,12 +45,6 @@ Requires:  apache-commons-logging
 Requires:  apache-commons-modeler
 Requires:  apache-commons-pool
 Requires:  apache-commons-validator
-Requires:  ejb_api
-Requires:  javamail
-Requires:  jms
-Requires:  log4j
-Requires:  servlet >= 2.5
-Requires:  jta
 
 BuildArch:      noarch
 
@@ -72,51 +57,50 @@ Java components or EJBs.
 
 %package javadoc
 Summary:        API docs for %{name}
-Group:          Documentation
-Requires:       jpackage-utils
 
 %description javadoc
 This package contains the API Documentation for %{name}.
 
 %prep
 %setup -q 
-%patch0 -b .sav0
+%pom_remove_plugin :findbugs-maven-plugin
+%pom_remove_plugin :maven-checkstyle-plugin
+%pom_disable_module quartz-jboss
+
+%pom_remove_dep org.apache.openejb:javaee-api %{name}
+%pom_add_dep javax.transaction:jta %{name}
+%pom_add_dep javax.jms:jms %{name}
+%pom_add_dep javax.servlet:servlet-api %{name}
+%pom_add_dep javax.ejb:ejb %{name}
+%pom_add_dep javax.mail:mail %{name}
+
+%pom_xpath_set "pom:project/pom:dependencies/pom:dependency[pom:artifactId = 'c3p0']/pom:groupId" com.mchange %{name}
+%pom_xpath_set "pom:project/pom:dependencies/pom:dependency[pom:groupId = 'junit']/pom:artifactId" junit %{name}
 
 %build
+
+%mvn_file :%{name} %{name}
+%mvn_file :%{name}-backward-compat %{name}-backward-compat
+%mvn_file :%{name}-examples %{name}-examples
 # skip tests for now due to requirement on hamcrest 1.2
-mvn-rpmbuild -Dmaven.test.skip=true install javadoc:aggregate
+%mvn_build -f -- -Dproject.build.sourceEncoding=UTF-8
 
 %install
-# jars
-mkdir -p $RPM_BUILD_ROOT%{_javadir}
-cp -p %{name}/target/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-cp -p %{name}-backward-compat/target/%{name}-backward-compat-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-backward-compat.jar
-
-# pom
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -m 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-parent.pom
-install -m 644 %{name}/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
-install -m 644 %{name}-backward-compat/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-backward-compat.pom
-
-%add_maven_depmap JPP-%{name}-parent.pom
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
-%add_maven_depmap JPP-%{name}-backward-compat.pom %{name}-backward-compat.jar
-
-#javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-%files
+%mvn_install
+
+%files -f .mfiles
 %doc README.txt NOTICE.txt LICENSE.txt
-%{_javadir}/*.jar
-%{_mavenpomdir}/JPP-*
-%{_mavendepmapfragdir}/%{name}
 
-%files javadoc
-%doc LICENSE.txt
-%doc %{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
+%doc LICENSE.txt NOTICE.txt
 
 %changelog
+* Sun Aug 18 2013 gil cattaneo <puntogil at libero.it> 0:2.1.2-8
+- fix c3p0 gId
+- use pom macros
+- built with XMvn
+- minor changes to adapt to current guideline
+
 * Fri Feb 22 2013 Andy Grimm <agrimm at gmail.com> - 0:2.1.2-7
 - Add several BuildRequires (RHBZ#914424)