rpms/mysql-connector-java/F-12 mysql-connector-java.spec,1.10,1.11

mef mef at fedoraproject.org
Fri Dec 4 16:44:20 UTC 2009


Author: mef

Update of /cvs/pkgs/rpms/mysql-connector-java/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3777/F-12

Modified Files:
	mysql-connector-java.spec 
Log Message:
Add Maven POM and metadata


Index: mysql-connector-java.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mysql-connector-java/F-12/mysql-connector-java.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- mysql-connector-java.spec	26 Aug 2009 01:45:48 -0000	1.10
+++ mysql-connector-java.spec	4 Dec 2009 16:44:20 -0000	1.11
@@ -8,7 +8,7 @@
 Summary:	Official JDBC driver for MySQL
 Name:		mysql-connector-java
 Version:	5.1.8
-Release:	1%{?dist}
+Release:	2%{?dist}
 Epoch:		1 
 
 # MySQL FLOSS Exception
@@ -59,6 +59,11 @@ BuildRequires:		log4j
 BuildRequires:		java-1.6.0-openjdk-devel
 BuildRequires:		java-1.5.0-gcj-devel
 BuildRequires:		jakarta-commons-logging
+
+Requires:               jpackage-utils
+Requires(post):         jpackage-utils
+Requires(postun):       jpackage-utils
+
 Provides:			mm.mysql
 Obsoletes:			mm.mysql
 
@@ -99,7 +104,6 @@ rm src/testsuite/simple/ReadOnlyCallable
 
 ant -DbuildDir=%{builddir} -DdistDir=%{distdir} -Dcom.mysql.jdbc.java6.rtjar=%{java6_rtpath} -Dcom.mysql.jdbc.java6.javac=%{java6_javacpath} -Dcom.mysql.jdbc.java6.java=%{java6_javapath}
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -114,21 +118,30 @@ install -m 644 %{builddir}/%{name}-%{ver
 %{_bindir}/aot-compile-rpm
 %endif
 
+# Install the Maven build information
+install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
+install -pm 644 src/doc/sources/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
+sed -i 's/>@.*</>%{version}</' $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
+
+%add_to_maven_depmap mysql %{name} %{version} JPP %{name}
 
-%if %{gcj_support}
 
 %post
+%update_maven_depmap
+%if %{gcj_support}
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
 fi
+%endif
 
 %postun
+%update_maven_depmap
+%if %{gcj_support}
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
   %{_bindir}/rebuild-gcj-db
 fi
-
 %endif
 
 %clean
@@ -138,11 +151,16 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(0644,root,root,0755)
 %doc CHANGES COPYING EXCEPTIONS-CONNECTOR-J README docs
 %attr(0644,root,root) %{_javadir}/*.jar
+%config(noreplace) %{_mavendepmapfragdir}/*
+%{_datadir}/maven2/poms/*.pom
 %if %{gcj_support}
 %attr(-,root,root) %{_libdir}/gcj/%{name}
 %endif
 
 %changelog
+* Fri Dec  4 2009 Mary Ellen Foster <mefoster at gmail.com> - 1:5.1.8-2
+- Add Maven POM and depmap fragment
+
 * Tue Aug 26 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 1:5.1.8-1
 - Update to 5.1.8 (resolves BZ#480154) with jboss integration disabled.
 - Added BR: java-1.6.0-openjdk-devel, java-1.5.0-gcj-devel, jakarta-commons-logging




More information about the scm-commits mailing list