[native-platform] Avoid needles Makefile patching
Mikolaj Izdebski
mizdebsk at fedoraproject.org
Tue Oct 21 12:21:14 UTC 2014
commit 07927f4a51f46e40140db9aac8e5da204b64db3f
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Tue Oct 21 14:21:07 2014 +0200
Avoid needles Makefile patching
native-platform.spec | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/native-platform.spec b/native-platform.spec
index 8e89ae5..0b8905a 100644
--- a/native-platform.spec
+++ b/native-platform.spec
@@ -5,7 +5,7 @@
Name: native-platform
Version: 0.10
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Java bindings for various native APIs
License: ASL 2.0
URL: https://github.com/adammurdoch/native-platform
@@ -60,15 +60,12 @@ sed -i 's/\r//' readme.md
mv src/curses/cpp/*.cpp src/main/cpp
mv src/shared/cpp/* src/main/cpp
-sed -i.javadoc8 "s|.PHONY: clean jar javadoc|.PHONY: clean jar|" Makefile
-sed -i.javadoc8 "s|jar javadoc arch-jar|jar arch-jar|" Makefile
-
%build
CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ;
CPPFLAGS="${CPPFLAGS:-%optflags}" ; export CPPFLAGS ;
CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ;
LDFLAGS="${LDFLAGS:-%__global_ldflags}"; export LDFLAGS;
-make %{?_smp_mflags} build javadoc JAVA_HOME=%{_jvmdir}/java
+make %{?_smp_mflags} JAVA_HOME=%{_jvmdir}/java
%mvn_artifact pom.xml build/%{name}.jar
%mvn_file net.rubygrapefruit:%{name} %{name}
@@ -88,6 +85,9 @@ arch=$(echo 'print(System.getProperty("os.arch"));' | java -cp $(build-classpath
%doc LICENSE
%changelog
+* Tue Oct 21 2014 Mikolaj Izdebski <mizdebsk at redhat.com> - 0.10-2
+- Avoid needles Makefile patching
+
* Tue Oct 21 2014 Mikolaj Izdebski <mizdebsk at redhat.com> - 0.10-1
- Fix build
- Re-enable javadoc package
More information about the scm-commits
mailing list