Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--rpmstubby/org.eclipse.linuxtools.rpmstubby/.gitignore2
-rw-r--r--rpmstubby/org.eclipse.linuxtools.rpmstubby/ChangeLog4
-rw-r--r--rpmstubby/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/rpmstubby/StubbyGenerator.java12
3 files changed, 6 insertions, 12 deletions
diff --git a/rpmstubby/org.eclipse.linuxtools.rpmstubby/.gitignore b/rpmstubby/org.eclipse.linuxtools.rpmstubby/.gitignore
index 8d94ef8deb..70ef5fcdb7 100644
--- a/rpmstubby/org.eclipse.linuxtools.rpmstubby/.gitignore
+++ b/rpmstubby/org.eclipse.linuxtools.rpmstubby/.gitignore
@@ -3,3 +3,5 @@ bin
javaCompiler...args
build.xml
target
+/target
+/target
diff --git a/rpmstubby/org.eclipse.linuxtools.rpmstubby/ChangeLog b/rpmstubby/org.eclipse.linuxtools.rpmstubby/ChangeLog
index 66c776f479..898c5acfa8 100644
--- a/rpmstubby/org.eclipse.linuxtools.rpmstubby/ChangeLog
+++ b/rpmstubby/org.eclipse.linuxtools.rpmstubby/ChangeLog
@@ -1,3 +1,7 @@
+2011-04-12 Alexander Kurtakov <akurtako@redhat.com>
+
+ * src/org/eclipse/linuxtools/rpmstubby/StubbyGenerator.java (generateSpecfile): Don't generate useless buildroot, clean, requires and provides.
+
2011-02-24 Alexander Kurtakov <akurtako@redhat.com>
Adapt to current packaging guidelines.
* src/org/eclipse/linuxtools/rpmstubby/StubbyPomGenerator.java (generateSpecfile): Drop buildroot.
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 d47cbf6598..a39781c562 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
@@ -100,24 +100,15 @@ public class StubbyGenerator {
} else {
buffer.append("Source0: #FIXME\n");
}
- buffer
- .append("BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)\n\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");
- buffer.append(getDepsOrReqs("Requires: ", mainPackage.getRequires()));
buffer.append("\n%description\n" + mainPackage.getDescription() + "\n");
for (SubPackage subPackage : subPackages) {
String subPackageName = getPackageName(subPackage.getName());
buffer.append("\n%package " + subPackageName + "\n");
buffer.append("Summary: " + subPackage.getSummary() + "\n");
buffer.append("Requires: %{name} = %{version}-%{release}\n");
- buffer
- .append(getDepsOrReqs("Requires: ", subPackage
- .getRequires()));
- buffer
- .append(getDepsOrReqs("Provides: ", subPackage
- .getProvides()));
buffer.append("Group: Development/Tools\n\n");
buffer.append("%description " + subPackageName + "\n");
buffer.append(subPackage.getDescription() + "\n");
@@ -126,13 +117,10 @@ public class StubbyGenerator {
generateBuildSection(buffer);
buffer.append("%install\n");
- buffer.append("%{__rm} -rf %{buildroot}\n");
buffer.append("install -d -m 755 %{buildroot}%{install_loc}\n\n");
buffer.append("%{__unzip} -q -d %{buildroot}%{install_loc} \\\n");
buffer.append(" build/rpmBuild/" + mainPackage.getName()
+ ".zip \n\n");
- buffer.append("%clean\n");
- buffer.append("%{__rm} -rf %{buildroot}\n\n");
generateFilesSections(buffer);
buffer.append("%changelog\n\n");
buffer.append("#FIXME\n");

Back to the top