commit e387f23644ab5f9cd72b373ec9f65db5569f8d32 Author: gil puntogil@libero.it Date: Fri Jul 5 10:39:30 2013 +0200
switch to XMvn
mckoi.spec | 55 +++++++++++++++---------------------------------------- 1 files changed, 15 insertions(+), 40 deletions(-) --- diff --git a/mckoi.spec b/mckoi.spec index 657076f..af7bd06 100644 --- a/mckoi.spec +++ b/mckoi.spec @@ -1,33 +1,18 @@ Name: mckoi Version: 1.0.4 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Open Source Java SQL Database -Group: Development/Libraries License: GPLv2 URL: http://mckoi.com/database/ Source0: http://mckoi.com/database/ver/%%7Bname%7D%%7Bversion%7D.zip - Patch0: %{name}-%{version}-jdk7.patch - Patch1: %{name}-%{version}-fix_fsf-address.patch
+BuildRequires: gnu-regexp BuildRequires: java-devel -BuildRequires: jpackage-utils - BuildRequires: javacc BuildRequires: maven-local -BuildRequires: maven-compiler-plugin -BuildRequires: maven-install-plugin -BuildRequires: maven-jar-plugin -BuildRequires: maven-javadoc-plugin -BuildRequires: maven-resources-plugin -BuildRequires: maven-surefire-plugin BuildRequires: zip - -BuildRequires: gnu-regexp - -Requires: java -Requires: jpackage-utils BuildArch: noarch
%description @@ -39,15 +24,12 @@ write-ahead-logging. Many of the design ideas implemented in this project were carried through into MckoiDDB, the evolution of this project.
%package javadoc -Group: Documentation Summary: Javadoc for %{name} -Requires: jpackage-utils
%description javadoc This package contains javadoc for %{name}.
%package demos -Group: Development/Libraries Summary: Demonstrations and samples for %{name} Requires: %{name} = %{version}-%{release} Requires: gnu-regexp @@ -80,21 +62,12 @@ javacc.sh SQL.jj
%build
-mvn-rpmbuild install javadoc:aggregate +%mvn_file :MckoiSQLDB %{name} +%mvn_file :MckoiSQLDB MckoiSQLDB
-%install - -mkdir -p %{buildroot}%{_javadir} -install -m 644 target/MckoiSQLDB-%{version}.jar \ - %{buildroot}%{_javadir}/%{name}.jar -( cd %{buildroot}%{_javadir} && ln -s %{name}.jar MckoiSQLDB.jar ) +%mvn_build
-mkdir -p %{buildroot}%{_mavenpomdir} -install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom -%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "mckoi:mckoi" - -mkdir -p %{buildroot}%{_javadocdir}/%{name} -cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name} +%install
mkdir -p %{buildroot}%{_datadir}/%{name} ( @@ -106,19 +79,17 @@ cp -pr contrib %{buildroot}%{_datadir}/%{name} cp -pr demo %{buildroot}%{_datadir}/%{name} cp -pr test %{buildroot}%{_datadir}/%{name}
+%mvn_install + + %check cd test sh ./runLocalTest.sh
-%files -%{_javadir}/%{name}.jar -%{_javadir}/MckoiSQLDB.jar -%{_mavenpomdir}/JPP-%{name}.pom -%{_mavendepmapfragdir}/%{name} +%files -f .mfiles %doc LICENSE.txt README.txt
-%files javadoc -%{_javadocdir}/%{name} +%files javadoc -f .mfiles-javadoc %doc LICENSE.txt
%files demos @@ -126,6 +97,10 @@ sh ./runLocalTest.sh %doc docs/*
%changelog +* Fri Jul 05 2013 gil cattaneo puntogil@libero.it 1.0.4-5 +- switch to XMvn +- minor changes to adapt to current guideline + * Thu Feb 14 2013 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 1.0.4-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
java-sig-commits@lists.fedoraproject.org