From ef0d30bafacd6c415e3ed2269666e76ae6674e6a Mon Sep 17 00:00:00 2001 From: Krzysztof Daniel Date: Aug 20 2012 09:11:55 +0000 Subject: Successful koji build. --- diff --git a/eclipse.spec b/eclipse.spec index 694cc95..79b7e70 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -352,7 +352,7 @@ sed -i -e "s/ctxt.getBundleContext().registerService(getClass().getName(), this, sed -i -e "s/ctxt.getBundleContext().registerService(PropertiesProvider.class.getName(), this, serviceProps)/ctxt.getBundleContext().registerService(PropertiesProvider.class.getName(), this, (Dictionary)(Object)serviceProps)/" rt.equinox.bundles/bundles/org.eclipse.equinox.ds.tests/bundles_src/tb17/org/eclipse/equinox/ds/tests/tb17/Worker.java sed -i -e "s/1407/1503/" rt.equinox.framework/launcher-binary-parent/pom.xml -sed -i -e "s/1500/1503/" rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/pom.xml +sed -i -e "s/1500/1503/" rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.${ARCH}/pom.xml #https://bugs.eclipse.org/bugs/show_bug.cgi?id=386503 @@ -534,11 +534,11 @@ install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir} ################################# LOCAL_PWD=`pwd` #change the installation p2 files -pushd TMP/org.eclipse.sdk.epp/target/products/org.fedoraproject.eclipse.platform/linux/gtk/x86_64/eclipse/p2/org.eclipse.equinox.p2.engine/profileRegistry/SDKProfile.profile/ +pushd TMP/org.eclipse.sdk.epp/target/products/org.fedoraproject.eclipse.platform/linux/gtk/${ARCH}/eclipse/p2/org.eclipse.equinox.p2.engine/profileRegistry/SDKProfile.profile/ for i in `ls | grep "profile.gz"` ; do \ echo $i ; \ gunzip $i ; \ - sed -i -e "s@${LOCAL_PWD}/TMP/org.eclipse.sdk.epp/target/products/org.fedoraproject.eclipse.platform/linux/gtk/x86_64/eclipse@%{_libdir}/eclipse@g" *.profile ; \ + sed -i -e "s@${LOCAL_PWD}/TMP/org.eclipse.sdk.epp/target/products/org.fedoraproject.eclipse.platform/linux/gtk/${ARCH}/eclipse@%{_libdir}/eclipse@g" *.profile ; \ gzip *.profile ; \ done @@ -546,7 +546,7 @@ for i in `ls | grep "profile.gz"` ; do \ popd #installation itself - copy it into right location -rsync -vrpl TMP/org.eclipse.sdk.epp/target/products/org.fedoraproject.eclipse.platform/linux/gtk/x86_64/eclipse \ +rsync -vrpl TMP/org.eclipse.sdk.epp/target/products/org.fedoraproject.eclipse.platform/linux/gtk/${ARCH}/eclipse \ $RPM_BUILD_ROOT%{_libdir} #desktop file