From 26587f84c52332628f6383cb3e02681d1629f7ee Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Wed, 12 Feb 2014 10:45:48 +0100 Subject: [PATCH] Make it buildable again --- xmvn.spec | 195 ++---------------------------------------------------- 1 file changed, 5 insertions(+), 190 deletions(-) diff --git a/xmvn.spec b/xmvn.spec index 6c88312..4d63ca4 100644 --- a/xmvn.spec +++ b/xmvn.spec @@ -35,11 +35,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']]" @@ -50,12 +45,11 @@ 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 %build -%mvn_build +mvn -X clean package tar --delay-directory-restore -xvf target/*tar.bz2 chmod -R +rwX %{name}-* @@ -113,11 +107,6 @@ rm %{buildroot}%{_datadir}/%{name}/lib/google-guice-no_aop.jar build-jar-repository %{buildroot}%{_datadir}/%{name}/lib/ \ guice/google-guice-no_aop -if [[ `find %{buildroot}%{_datadir}/%{name}/lib -type f -name '*.jar' -not -name '*%{name}*' | wc -l` -ne 0 ]];then - echo "Some jar files were not symlinked during build. Aborting" - exit 1 -fi - # /usr/bin/xmvn script cat <%{buildroot}%{_bindir}/%{name} @@ -127,16 +116,9 @@ exec mvn "\${@}" EOF # make sure our conf is identical to maven so yum won't freak out +install -d -m 755 %{buildroot}%{_datadir}/%{name}/conf/ cp -P %{_datadir}/maven/conf/settings.xml %{buildroot}%{_datadir}/%{name}/conf/ -%pretrans -p --- we changed symlink to dir in 0.5.0-1, workaround RPM issues -for key, dir in pairs({"conf", "conf/logging", "boot"}) do - path = "%{_datadir}/%{name}/" .. dir - if posix.readlink(path) then - os.remove(path) - end -end %files -f .mfiles %doc LICENSE NOTICE @@ -144,177 +126,10 @@ end %attr(755,-,-) %{_bindir}/* %{_datadir}/%{name} -%files javadoc -f .mfiles-javadoc +%files javadoc %doc LICENSE NOTICE %changelog -* Fri Oct 18 2013 Mikolaj Izdebski - 1.2.0-1 -- Update to upstream version 1.2.0 +* Wed Feb 12 2014 Michal Srb - 1.2.0-1 +- XMvn config for Jenkins -* 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