diff --git a/.gitignore b/.gitignore index e1d6d09..a64a217 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ R_1_1_1.tar.bz2 /org.eclipse.epp.mpc-00b427e4d68153b176e8b43f6ac8b73856c7ae7d /org.eclipse.epp.mpc-7feb49b2fa4976a22e0aed4c3eec6bc1aa7c20c0.tar.bz2 /org.eclipse.epp.mpc-519e70b90429c4fa2a14b35ab8bb6907519cb101.tar.bz2 +/R_1_2_2.tar.bz2 diff --git a/eclipse-mpc.spec b/eclipse-mpc.spec index 65616a5..e95c521 100644 --- a/eclipse-mpc.spec +++ b/eclipse-mpc.spec @@ -1,32 +1,30 @@ -%global src_repo_tag 519e70b90429c4fa2a14b35ab8bb6907519cb101 +%global src_repo_tag R_1_2_2 %global install_loc %{_datadir}/eclipse/dropins/mpc Name: eclipse-mpc -Version: 1.2.1 -Release: 0.2.git519e70b%{?dist} +Version: 1.2.2 +Release: 1%{?dist} Summary: Eclipse Marketplace Client Group: Development/Tools License: EPL URL: http://www.eclipse.org/mpc/ -Source0: http://git.eclipse.org/c/mpc/org.eclipse.epp.mpc.git/snapshot/org.eclipse.epp.mpc-%{src_repo_tag}.tar.bz2 +Source0: http://git.eclipse.org/c/mpc/org.eclipse.epp.mpc.git/snapshot/%{src_repo_tag}.tar.bz2 BuildArch: noarch BuildRequires: eclipse-pde >= 1:3.4.0 BuildRequires: eclipse-p2-discovery >= 1.0.0 -BuildRequires: jakarta-commons-httpclient BuildRequires: maven-local BuildRequires: feclipse-maven-plugin Requires: eclipse-platform >= 3.6.0 Requires: eclipse-p2-discovery >= 1.0.0 -Requires: jakarta-commons-httpclient %description The Eclipse Marketplace Client provides access to extension catalogs. %prep -%setup -q -n org.eclipse.epp.mpc-%{src_repo_tag} +%setup -q -n %{src_repo_tag} %{__chmod} a-x org.eclipse.epp.mpc.feature/license.html @@ -43,24 +41,23 @@ The Eclipse Marketplace Client provides access to extension catalogs. %pom_xpath_remove "pom:build/pom:pluginManagement/pom:plugins/pom:plugin[pom:artifactId='tycho-packaging-plugin']" %build -mvn-rpmbuild verify -Pdist -Dmaven.test.skip=true +%mvn_build -i -j -f -- -Pdist %install install -d -m 755 %{buildroot}%{install_loc} -mvn-rpmbuild org.fedoraproject:feclipse-maven-plugin:install \ +xmvn -o org.fedoraproject:feclipse-maven-plugin:install \ -DsourceRepo=org.eclipse.epp.mpc.site/target/site -DtargetLocation=%{buildroot}%{install_loc}/eclipse -pushd %{buildroot}%{install_loc}/eclipse/plugins - ln -s %{_javadir}/commons-httpclient.jar -popd - %files %{install_loc} %doc org.eclipse.epp.mpc.feature/epl-v10.html %doc org.eclipse.epp.mpc.feature/license.html %changelog +* Thu Sep 4 2014 Alexander Kurtakov 1.2.2-1 +- Update to official 1.2.2 release. + * Sat Jun 07 2014 Fedora Release Engineering - 1.2.1-0.2.git519e70b - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild diff --git a/sources b/sources index d893de0..ea59c31 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b1af613a22d7b1daa65daeedd1ae99e8 org.eclipse.epp.mpc-519e70b90429c4fa2a14b35ab8bb6907519cb101.tar.bz2 +d435df1cc255f07988242330b97ce042 R_1_2_2.tar.bz2