Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kurtakov2011-07-22 17:02:01 -0400
committerAlexander Kurtakov2011-07-22 17:03:05 -0400
commit299dbaba42a52455655e68c0064ea7cd230424c4 (patch)
tree61d7be1e17bb63a25eb0a8b347d658d174235f0a /rpmstubby
parent8a91e9fe28c3a47610f5f9802907cd82cd2c4d72 (diff)
downloadorg.eclipse.linuxtools-299dbaba42a52455655e68c0064ea7cd230424c4.tar.gz
org.eclipse.linuxtools-299dbaba42a52455655e68c0064ea7cd230424c4.tar.xz
org.eclipse.linuxtools-299dbaba42a52455655e68c0064ea7cd230424c4.zip
Remove fetch script generation leftovers.
Diffstat (limited to 'rpmstubby')
-rw-r--r--rpmstubby/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/rpmstubby/StubbyGenerator.java23
1 files changed, 3 insertions, 20 deletions
diff --git a/rpmstubby/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/rpmstubby/StubbyGenerator.java b/rpmstubby/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/rpmstubby/StubbyGenerator.java
index 0545101568..ab706c9584 100644
--- a/rpmstubby/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/rpmstubby/StubbyGenerator.java
+++ b/rpmstubby/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/rpmstubby/StubbyGenerator.java
@@ -41,7 +41,6 @@ public class StubbyGenerator {
private MainPackage mainPackage;
private List<SubPackage> subPackages;
- private boolean withFetchScript;
/**
* Creates the specfile and fetch script generator for the given packages.
@@ -65,8 +64,6 @@ public class StubbyGenerator {
StringBuilder buffer = new StringBuilder();
String simplePackageName = getPackageName(mainPackage.getName());
String packageName = "eclipse-" + simplePackageName;
- if (withFetchScript)
- buffer.append("%global src_repo_tag #FIXME\n");
buffer.append("%global eclipse_base %{_libdir}/eclipse\n");
buffer.append("%global install_loc %{_datadir}/eclipse/dropins/"
+ simplePackageName.toLowerCase() + "\n\n");
@@ -79,15 +76,7 @@ public class StubbyGenerator {
buffer.append("Group: Development/Tools\n");
buffer.append("License: " + mainPackage.getLicense() + "\n");
buffer.append("URL: " + mainPackage.getURL() + "\n");
- if (withFetchScript) {
- String fetchScriptName = "%{name}-fetch-src.sh";
- buffer.append("## sh ").append(fetchScriptName).append("\n");
- buffer.append("Source0: %{name}-fetched-src-%{src_repo_tag}.tar.bz2\n");
- buffer.append("Source1: ").append(fetchScriptName)
- .append("\n");
- } else {
- buffer.append("Source0: #FIXME\n");
- }
+ buffer.append("Source0: #FIXME\n");
buffer.append("BuildArch: noarch\n\n");
buffer.append("BuildRequires: eclipse-pde >= 1:3.4.0\n");
buffer.append("Requires: eclipse-platform >= 3.4.0\n");
@@ -138,14 +127,8 @@ public class StubbyGenerator {
private void generatePrepSection(StringBuilder buffer) {
buffer.append("\n%prep\n");
- // Fetch scripts generated by rpmstubby don't require adding -n options
- // to %setup call but -c.
- if (withFetchScript) {
- buffer.append("%setup -q -c\n\n");
- } else {
- buffer.append("#FIXME Replace FIXME with the root directory name in Source0\n");
- buffer.append("%setup -q -n FIXME\n\n");
- }
+ buffer.append("#FIXME Replace FIXME with the root directory name in Source0\n");
+ buffer.append("%setup -q -n FIXME\n\n");
}
private void generateBuildSection(StringBuilder buffer) {

Back to the top