diff --git a/xmvn.spec b/xmvn.spec index 20f7dea..fde7bf7 100644 --- a/xmvn.spec +++ b/xmvn.spec @@ -1,5 +1,5 @@ Name: xmvn -Version: 1.2.0 +Version: 1.4.0 Release: 1%{?dist} Summary: Local Extensions for Apache Maven License: ASL 2.0 @@ -7,7 +7,7 @@ URL: http://mizdebsk.fedorapeople.org/xmvn BuildArch: noarch Source0: %{name}-%{version}.tar.xz -BuildRequires: maven >= 3.1.0 +BuildRequires: maven >= 3.1.1-13 BuildRequires: maven-local BuildRequires: beust-jcommander BuildRequires: cglib @@ -20,7 +20,7 @@ BuildRequires: apache-ivy BuildRequires: sisu-mojos BuildRequires: junit -Requires: maven >= 3.1.0 +Requires: maven >= 3.1.1-13 %description This package provides extensions for Apache Maven that can be used to @@ -37,10 +37,6 @@ This package provides %{summary}. %prep %setup -q -# Compat alias required by Tycho -# FIXME: remove this once Tycho is updated -%mvn_alias :xmvn-connector-ivy :xmvn-connector - # remove dependency plugin maven-binaries execution # we provide apache-maven by symlink %pom_xpath_remove "pom:executions/pom:execution[pom:id[text()='maven-binaries']]" @@ -51,7 +47,6 @@ mver=$(sed -n '//{s/.*>\(.*\)<.*/\1/;p}' \ mkdir -p target/dependency/ ln -s %{_datadir}/maven target/dependency/apache-maven-$mver - # skip ITs for now (mix of old & new XMvn config causes issues rm -rf src/it @@ -59,14 +54,14 @@ rm -rf src/it %mvn_build -X tar --delay-directory-restore -xvf target/*tar.bz2 -chmod -R +rwX %{name}-* +chmod -R +rwX %{name}-%{version}* %install %mvn_install install -d -m 755 %{buildroot}%{_datadir}/%{name} -cp -r %{name}-[0-9.]*/* %{buildroot}%{_datadir}/%{name}/ +cp -r %{name}-%{version}*/* %{buildroot}%{_datadir}/%{name}/ 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 @@ -95,7 +90,8 @@ cp -r %{_datadir}/maven/lib/* %{buildroot}%{_datadir}/%{name}/lib/ # possibly recreate symlinks that can be automated with xmvn-subst %{name}-subst %{buildroot}%{_datadir}/%{name}/ -for jar in core connector-aether connector-ivy;do +#for jar in core connector;do +for jar in core connector-aether connector-ivy; do ln -sf %{_javadir}/%{name}/%{name}-$jar.jar %{buildroot}%{_datadir}/%{name}/lib done @@ -140,6 +136,7 @@ for key, dir in pairs({"conf", "conf/logging", "boot"}) do end %files -f .mfiles +%dir %{_javadir}/%{name} %doc LICENSE NOTICE %doc AUTHORS README %attr(755,-,-) %{_bindir}/* @@ -149,173 +146,6 @@ end %doc LICENSE NOTICE %changelog -* Fri Oct 18 2013 Mikolaj Izdebski - 1.2.0-1 -- Update to upstream version 1.2.0 +* Fri Feb 21 2014 Michal Srb - 1.4.0-1 +- Spec for Jenkins builds -* Mon Oct 07 2013 Stanislav Ochotnicky - 1.1.0-2 -- Apply patch for rhbz#1015596 - -* Tue Oct 01 2013 Stanislav Ochotnicky - 1.1.0-1 -- Update to upstream version 1.1.0 - -* Fri Sep 27 2013 Stanislav Ochotnicky - 1.0.2-3 -- Add __default package specifier support - -* Mon Sep 23 2013 Mikolaj Izdebski - 1.0.2-2 -- Don't try to relativize symlink targets -- Restotre support for relative symlinks - -* Fri Sep 20 2013 Mikolaj Izdebski - 1.0.2-1 -- Update to upstream version 1.0.2 - -* Tue Sep 10 2013 Stanislav Ochotnicky - 1.0.0-2 -- Workaround broken symlinks for core and connector (#986909) - -* Mon Sep 09 2013 Stanislav Ochotnicky - 1.0.0-1 -- Updating to upstream 1.0.0 - -* Tue Sep 3 2013 Stanislav Ochotnicky 1.0.0-0.2.alpha1 -- Update to upstream version 1.0.0 alpha1 - -* Sun Aug 04 2013 Fedora Release Engineering - 0.5.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Tue Jul 23 2013 Mikolaj Izdebski - 0.5.1-3 -- Rebuild without bootstrapping - -* Tue Jul 23 2013 Mikolaj Izdebski - 0.5.1-2 -- Install symlink to simplelogger.properties in %{_sysconfdir} - -* Tue Jul 23 2013 Mikolaj Izdebski - 0.5.1-1 -- Update to upstream version 0.5.1 - -* Tue Jul 23 2013 Mikolaj Izdebski - 0.5.0-7 -- Allow installation of Eclipse plugins in javadir - -* Mon Jul 22 2013 Mikolaj Izdebski - 0.5.0-6 -- Remove workaround for plexus-archiver bug -- Use sonatype-aether symlinks - -* Wed Jun 5 2013 Mikolaj Izdebski - 0.5.0-5 -- Fix resolution of tools.jar - -* Fri May 31 2013 Stanislav Ochotnicky - 0.5.0-4 -- Fix handling of packages with dots in groupId -- Previous versions also fixed bug #948731 - -* Tue May 28 2013 Stanislav Ochotnicky - 0.5.0-3 -- Move pre scriptlet to pretrans and implement in lua - -* Fri May 24 2013 Stanislav Ochotnicky - 0.5.0-2 -- Fix upgrade path scriptlet -- Add patch to fix NPE when debugging is disabled - -* Fri May 24 2013 Stanislav Ochotnicky - 0.5.0-1 -- Update to upstream version 0.5.0 - -* Fri May 17 2013 Mikolaj Izdebski - 0.4.2-3 -- Add patch: install MOJO fix - -* Wed Apr 17 2013 Mikolaj Izdebski - 0.4.2-2 -- Update plexus-containers-container-default JAR location - -* Tue Apr 9 2013 Mikolaj Izdebski - 0.4.2-1 -- Update to upstream version 0.4.2 - -* Thu Mar 21 2013 Michal Srb - 0.4.1-1 -- Update to upstream version 0.4.1 - -* 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 - -* 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 - -* 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 -- Mirror maven directory structure -- Add Plexus Classworlds config file - -* 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 - -* Mon Feb 25 2013 Mikolaj Izdebski - 0.3.1-2 -- Install effective POMs into a separate directory - -* Thu Feb 7 2013 Mikolaj Izdebski - 0.3.1-1 -- Update to upstream version 0.3.1 - -* Tue Feb 5 2013 Mikolaj Izdebski - 0.3.0-1 -- Update to upstream version 0.3.0 -- Don't rely on JPP symlinks when resolving artifacts -- Blacklist more artifacts -- Fix dependencies - -* Thu Jan 24 2013 Mikolaj Izdebski - 0.2.6-1 -- Update to upstream version 0.2.6 - -* Mon Jan 21 2013 Mikolaj Izdebski - 0.2.5-1 -- Update to upstream version 0.2.5 - -* Fri Jan 11 2013 Mikolaj Izdebski - 0.2.4-1 -- Update to upstream version 0.2.4 - -* Wed Jan 9 2013 Mikolaj Izdebski - 0.2.3-1 -- Update to upstream version 0.2.3 - -* Tue Jan 8 2013 Mikolaj Izdebski - 0.2.2-1 -- Update to upstream version 0.2.2 - -* Tue Jan 8 2013 Mikolaj Izdebski - 0.2.1-1 -- Update to upstream version 0.2.1 - -* Mon Jan 7 2013 Mikolaj Izdebski - 0.2.0-1 -- Update to upstream version 0.2.0 -- New major features: depmaps, compat symlinks, builddep MOJO -- Install effective POMs for non-POM artifacts -- Multiple major and minor bugfixes -- Drop support for resolving artifacts from %%_javajnidir - -* Fri Dec 7 2012 Mikolaj Izdebski - 0.1.5-1 -- Update to upstream version 0.1.5 - -* Fri Dec 7 2012 Mikolaj Izdebski - 0.1.4-1 -- Update to upstream version 0.1.4 - -* Fri Dec 7 2012 Mikolaj Izdebski - 0.1.3-1 -- Update to upstream version 0.1.3 - -* Fri Dec 7 2012 Mikolaj Izdebski - 0.1.2-1 -- Update to upstream version 0.1.2 - -* Fri Dec 7 2012 Mikolaj Izdebski - 0.1.1-1 -- Update to upstream version 0.1.1 - -* Thu Dec 6 2012 Mikolaj Izdebski - 0.1.0-1 -- Update to upstream version 0.1.0 -- Implement auto requires generator - -* Mon Dec 3 2012 Mikolaj Izdebski - 0.0.2-1 -- Update to upstream version 0.0.2 - -* Thu Nov 29 2012 Mikolaj Izdebski - 0.0.1-1 -- Update to upstream version 0.0.1 - -* Wed Nov 28 2012 Mikolaj Izdebski - 0-2 -- Add jpackage scripts - -* Mon Nov 5 2012 Mikolaj Izdebski - 0-1 -- Initial packaging