From 88a544fa7e9c528a214b1dec335334f494d2c3c4 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 6 Mar 2013 09:54:04 +0100 Subject: [PATCH 1/8] Update to upstream snapshot of version 0.4.0 --- sources | 2 +- xmvn.spec | 25 +++++++++++++++++++------ 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/sources b/sources index e21e386..22595f3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1f3d07783d31ad05b87d3bf6ba179063 xmvn-0.3.1.tar.xz +69f811d7d41642eb65c7b58fd6d7e6f6 xmvn-snapshot.tar.xz diff --git a/xmvn.spec b/xmvn.spec index 43a0ae6..8057a11 100644 --- a/xmvn.spec +++ b/xmvn.spec @@ -1,20 +1,30 @@ Name: xmvn -Version: 0.3.1 -Release: 1%{?dist} +Version: 0.4.0 +Release: 0.1%{?dist} Summary: Local Extensions for Apache Maven License: ASL 2.0 URL: http://mizdebsk.fedorapeople.org/xmvn BuildArch: noarch -Source0: https://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.xz +Source0: http://mizdebsk.fedorapeople.org/%{name}/%{name}-snapshot.tar.xz BuildRequires: maven-local BuildRequires: beust-jcommander +BuildRequires: guava BuildRequires: plexus-classworlds +BuildRequires: plexus-classworlds +BuildRequires: plexus-containers-container-default +BuildRequires: plexus-utils +BuildRequires: xbean BuildRequires: xml-commons-apis Requires: maven Requires: beust-jcommander +Requires: guava Requires: plexus-classworlds +Requires: plexus-classworlds +Requires: plexus-containers-container-default +Requires: plexus-utils +Requires: xbean Requires: xml-commons-apis %description @@ -30,11 +40,11 @@ Summary: API documentation for %{name} This package provides %{summary}. %prep -%setup -q +%setup -q -n %{name}-snapshot %build %mvn_file ":{xmvn-{core,connector}}" %{name}/@1 %{_datadir}/%{name}/lib/@1 -%mvn_build +%mvn_build -f %install %mvn_install @@ -43,7 +53,7 @@ This package provides %{summary}. %jpackage_script org.fedoraproject.maven.Launcher "" "" %{name}/%{name}-launcher:plexus/classworlds %{name} false # /usr/bin/xmvn-resolve script -%jpackage_script org.fedoraproject.maven.tools.resolver.ResolverCli "" "" %{name}/%{name}-core:%{name}/%{name}-resolve:beust-jcommander:xml-commons-apis %{name}-resolve true +%jpackage_script org.fedoraproject.maven.tools.resolver.ResolverCli "" "" %{name}/%{name}-core:%{name}/%{name}-resolve:beust-jcommander:xml-commons-apis:plexus/containers-container-default:plexus/classworlds:plexus/utils:xbean/xbean-reflect:guava %{name}-resolve true %files -f .mfiles @@ -56,6 +66,9 @@ This package provides %{summary}. %doc LICENSE NOTICE %changelog +* Wed Mar 6 2013 Mikolaj Izdebski - 0.4.0-0.1 +- Update to upstream snapshot of version 0.4.0 + * Thu Feb 7 2013 Mikolaj Izdebski - 0.3.1-1 - Update to upstream version 0.3.1 From 630229d4f6f23ea3f47bbf783b372d7c6471067f Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 6 Mar 2013 16:52:10 +0100 Subject: [PATCH 2/8] Update to newer snapshot --- .gitignore | 1 + sources | 2 +- xmvn.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index a5fc3fe..b708fe2 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /xmvn-0.2.6.tar.xz /xmvn-0.3.0.tar.xz /xmvn-0.3.1.tar.xz +/xmvn-snapshot.tar.xz diff --git a/sources b/sources index 22595f3..abe9ab3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -69f811d7d41642eb65c7b58fd6d7e6f6 xmvn-snapshot.tar.xz +55795cead4a880379a3e425f1852e739 xmvn-snapshot.tar.xz diff --git a/xmvn.spec b/xmvn.spec index 8057a11..6d098ac 100644 --- a/xmvn.spec +++ b/xmvn.spec @@ -1,6 +1,6 @@ Name: xmvn Version: 0.4.0 -Release: 0.1%{?dist} +Release: 0.2%{?dist} Summary: Local Extensions for Apache Maven License: ASL 2.0 URL: http://mizdebsk.fedorapeople.org/xmvn @@ -66,6 +66,9 @@ This package provides %{summary}. %doc LICENSE NOTICE %changelog +* Wed Mar 6 2013 Mikolaj Izdebski - 0.4.0-0.2 +- Update to newer snapshot + * Wed Mar 6 2013 Mikolaj Izdebski - 0.4.0-0.1 - Update to upstream snapshot of version 0.4.0 From c711afeea6abb3c292e485d414857b72fc8499da Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 12 Mar 2013 13:51:53 +0100 Subject: [PATCH 3/8] Update to new upstream snapshot - Create custom /usr/bin/xmvn instead of using %jpackage_script - Mirror maven directory structure - Add Plexus Classworlds config file --- sources | 2 +- xmvn-classworlds.conf | 7 +++++++ xmvn.spec | 28 +++++++++++++++++++++++++--- 3 files changed, 33 insertions(+), 4 deletions(-) create mode 100644 xmvn-classworlds.conf diff --git a/sources b/sources index abe9ab3..70a7ce6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -55795cead4a880379a3e425f1852e739 xmvn-snapshot.tar.xz +7aeb9f9183b1112379500a9d8ecf8411 xmvn-snapshot.tar.xz diff --git a/xmvn-classworlds.conf b/xmvn-classworlds.conf new file mode 100644 index 0000000..3b899b1 --- /dev/null +++ b/xmvn-classworlds.conf @@ -0,0 +1,7 @@ +main is org.fedoraproject.maven.connector.Main from plexus.core + +[plexus.core] +optionally ${maven.home}/lib/ext/*.jar +load ${maven.home}/lib/*.jar +optionally ${maven.home}/lib/maven/ext/*.jar +load ${maven.home}/lib/maven/*.jar diff --git a/xmvn.spec b/xmvn.spec index 6d098ac..927c8bd 100644 --- a/xmvn.spec +++ b/xmvn.spec @@ -1,11 +1,12 @@ Name: xmvn Version: 0.4.0 -Release: 0.2%{?dist} +Release: 0.3%{?dist} Summary: Local Extensions for Apache Maven License: ASL 2.0 URL: http://mizdebsk.fedorapeople.org/xmvn BuildArch: noarch Source0: http://mizdebsk.fedorapeople.org/%{name}/%{name}-snapshot.tar.xz +Source1: %{name}-classworlds.conf BuildRequires: maven-local BuildRequires: beust-jcommander @@ -44,17 +45,32 @@ This package provides %{summary}. %build %mvn_file ":{xmvn-{core,connector}}" %{name}/@1 %{_datadir}/%{name}/lib/@1 +# Tests are skipped as a workaround for rhbz#911365 %mvn_build -f %install %mvn_install -# /usr/bin/xmvn script -%jpackage_script org.fedoraproject.maven.Launcher "" "" %{name}/%{name}-launcher:plexus/classworlds %{name} false +install -d -m 755 %{buildroot}%{_datadir}/%{name}/bin +install -d -m 755 %{buildroot}%{_datadir}/%{name}/lib/ext +install -p -m 644 %{SOURCE1} %{buildroot}%{_datadir}/%{name}/bin/m2.conf +ln -sf %{_datadir}/maven/bin/mvn %{buildroot}%{_datadir}/%{name}/bin/mvn +ln -sf %{_datadir}/maven/bin/mvnDebug %{buildroot}%{_datadir}/%{name}/bin/mvnDebug +ln -sf %{_datadir}/maven/bin/mvnyjp %{buildroot}%{_datadir}/%{name}/bin/mvnyjp +ln -sf %{_datadir}/maven/conf %{buildroot}%{_datadir}/%{name}/conf +ln -sf %{_datadir}/maven/boot %{buildroot}%{_datadir}/%{name}/boot +ln -sf %{_datadir}/maven/lib %{buildroot}%{_datadir}/%{name}/lib/maven # /usr/bin/xmvn-resolve script %jpackage_script org.fedoraproject.maven.tools.resolver.ResolverCli "" "" %{name}/%{name}-core:%{name}/%{name}-resolve:beust-jcommander:xml-commons-apis:plexus/containers-container-default:plexus/classworlds:plexus/utils:xbean/xbean-reflect:guava %{name}-resolve true +# /usr/bin/xmvn script +cat <%{buildroot}%{_bindir}/%{name} +#!/bin/sh -e +export M2_HOME="\${M2_HOME:-%{_datadir}/%{name}}" +exec mvn "${@}" +EOF + %files -f .mfiles %doc LICENSE NOTICE @@ -66,6 +82,12 @@ This package provides %{summary}. %doc LICENSE NOTICE %changelog +* Tue Mar 12 2013 Mikolaj Izdebski - 0.4.0-0.3 +- Update to new upstream snapshot +- Create custom /usr/bin/xmvn instead of using %%jpackage_script +- Mirror maven directory structure +- Add Plexus Classworlds config file + * Wed Mar 6 2013 Mikolaj Izdebski - 0.4.0-0.2 - Update to newer snapshot From f287058f0c6949a5069e42ecdf95839a1baa6abe Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 13 Mar 2013 08:59:37 +0100 Subject: [PATCH 4/8] Set proper permissions for scripts in _bindir --- xmvn.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/xmvn.spec b/xmvn.spec index 927c8bd..44511e5 100644 --- a/xmvn.spec +++ b/xmvn.spec @@ -1,6 +1,6 @@ Name: xmvn Version: 0.4.0 -Release: 0.3%{?dist} +Release: 0.4%{?dist} Summary: Local Extensions for Apache Maven License: ASL 2.0 URL: http://mizdebsk.fedorapeople.org/xmvn @@ -68,20 +68,23 @@ ln -sf %{_datadir}/maven/lib %{buildroot}%{_datadir}/%{name}/lib/maven cat <%{buildroot}%{_bindir}/%{name} #!/bin/sh -e export M2_HOME="\${M2_HOME:-%{_datadir}/%{name}}" -exec mvn "${@}" +exec mvn "\${@}" EOF %files -f .mfiles %doc LICENSE NOTICE %doc AUTHORS README -%{_bindir}/* +%attr(755,-,-) %{_bindir}/* %{_datadir}/%{name} %files javadoc -f .mfiles-javadoc %doc LICENSE NOTICE %changelog +* Wed Mar 13 2013 Mikolaj Izdebski - 0.4.0-0.4 +- Set proper permissions for scripts in _bindir + * Tue Mar 12 2013 Mikolaj Izdebski - 0.4.0-0.3 - Update to new upstream snapshot - Create custom /usr/bin/xmvn instead of using %%jpackage_script From 2a27730b7bcab64677c36f53c53e675005e252a8 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 13 Mar 2013 16:32:46 +0100 Subject: [PATCH 5/8] Update to newer snapshot --- sources | 2 +- xmvn.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 70a7ce6..8e59a1d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7aeb9f9183b1112379500a9d8ecf8411 xmvn-snapshot.tar.xz +fa055d350367a5dc1f71732947d23f4e xmvn-snapshot.tar.xz diff --git a/xmvn.spec b/xmvn.spec index 44511e5..07f3b5c 100644 --- a/xmvn.spec +++ b/xmvn.spec @@ -1,6 +1,6 @@ Name: xmvn Version: 0.4.0 -Release: 0.4%{?dist} +Release: 0.5%{?dist} Summary: Local Extensions for Apache Maven License: ASL 2.0 URL: http://mizdebsk.fedorapeople.org/xmvn @@ -82,6 +82,9 @@ EOF %doc LICENSE NOTICE %changelog +* Wed Mar 13 2013 Mikolaj Izdebski - 0.4.0-0.5 +- Update to newer snapshot + * Wed Mar 13 2013 Mikolaj Izdebski - 0.4.0-0.4 - Set proper permissions for scripts in _bindir From cef3fb6a29a5482474b6b209ce52d4d0c52649c0 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 14 Mar 2013 11:12:30 +0100 Subject: [PATCH 6/8] Update to newer snapshot --- sources | 2 +- xmvn.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 8e59a1d..eb7191a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fa055d350367a5dc1f71732947d23f4e xmvn-snapshot.tar.xz +47025715d2c868d1f56fb4d6dd069177 xmvn-snapshot.tar.xz diff --git a/xmvn.spec b/xmvn.spec index 07f3b5c..a6d802c 100644 --- a/xmvn.spec +++ b/xmvn.spec @@ -1,6 +1,6 @@ Name: xmvn Version: 0.4.0 -Release: 0.5%{?dist} +Release: 0.6%{?dist} Summary: Local Extensions for Apache Maven License: ASL 2.0 URL: http://mizdebsk.fedorapeople.org/xmvn @@ -82,6 +82,9 @@ EOF %doc LICENSE NOTICE %changelog +* Thu Mar 14 2013 Mikolaj Izdebski - 0.4.0-0.6 +- Update to newer snapshot + * Wed Mar 13 2013 Mikolaj Izdebski - 0.4.0-0.5 - Update to newer snapshot From f356f6336313c5a26d89cfd57a515ef75277923b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 15 Mar 2013 15:52:04 +0100 Subject: [PATCH 7/8] Enable tests --- xmvn.spec | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/xmvn.spec b/xmvn.spec index a6d802c..07b2506 100644 --- a/xmvn.spec +++ b/xmvn.spec @@ -1,6 +1,6 @@ Name: xmvn Version: 0.4.0 -Release: 0.6%{?dist} +Release: 0.7%{?dist} Summary: Local Extensions for Apache Maven License: ASL 2.0 URL: http://mizdebsk.fedorapeople.org/xmvn @@ -10,9 +10,9 @@ Source1: %{name}-classworlds.conf BuildRequires: maven-local BuildRequires: beust-jcommander +BuildRequires: cglib BuildRequires: guava BuildRequires: plexus-classworlds -BuildRequires: plexus-classworlds BuildRequires: plexus-containers-container-default BuildRequires: plexus-utils BuildRequires: xbean @@ -22,7 +22,6 @@ Requires: maven Requires: beust-jcommander Requires: guava Requires: plexus-classworlds -Requires: plexus-classworlds Requires: plexus-containers-container-default Requires: plexus-utils Requires: xbean @@ -42,11 +41,13 @@ This package provides %{summary}. %prep %setup -q -n %{name}-snapshot +# Add cglib test dependency as a workaround for rhbz#911365 +%pom_xpath_inject pom:project "" +#%%pom_add_dep cglib:cglib::test %build %mvn_file ":{xmvn-{core,connector}}" %{name}/@1 %{_datadir}/%{name}/lib/@1 -# Tests are skipped as a workaround for rhbz#911365 -%mvn_build -f +%mvn_build -X %install %mvn_install @@ -82,6 +83,9 @@ EOF %doc LICENSE NOTICE %changelog +* Fri Mar 15 2013 Mikolaj Izdebski - 0.4.0-0.7 +- Enable tests + * Thu Mar 14 2013 Mikolaj Izdebski - 0.4.0-0.6 - Update to newer snapshot From 6fe095feee5d91561938b815fd8344f0998dd256 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 15 Mar 2013 15:59:20 +0100 Subject: [PATCH 8/8] Update to upstream version 0.4.0 --- .gitignore | 1 + sources | 2 +- xmvn.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b708fe2..dc74a0e 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /xmvn-0.3.0.tar.xz /xmvn-0.3.1.tar.xz /xmvn-snapshot.tar.xz +/xmvn-0.4.0.tar.xz diff --git a/sources b/sources index eb7191a..ac49d79 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -47025715d2c868d1f56fb4d6dd069177 xmvn-snapshot.tar.xz +bb67de90e372bc7f68b2dd451bda3cb4 xmvn-0.4.0.tar.xz diff --git a/xmvn.spec b/xmvn.spec index 07b2506..a3b2033 100644 --- a/xmvn.spec +++ b/xmvn.spec @@ -1,11 +1,11 @@ Name: xmvn Version: 0.4.0 -Release: 0.7%{?dist} +Release: 1%{?dist} Summary: Local Extensions for Apache Maven License: ASL 2.0 URL: http://mizdebsk.fedorapeople.org/xmvn BuildArch: noarch -Source0: http://mizdebsk.fedorapeople.org/%{name}/%{name}-snapshot.tar.xz +Source0: https://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.xz Source1: %{name}-classworlds.conf BuildRequires: maven-local @@ -83,6 +83,9 @@ EOF %doc LICENSE NOTICE %changelog +* Fri Mar 15 2013 Mikolaj Izdebski - 0.4.0-1 +- Update to upstream version 0.4.0 + * Fri Mar 15 2013 Mikolaj Izdebski - 0.4.0-0.7 - Enable tests