From 777532a4f4583ac657a90aa4deff6b42278c0862 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Tue, 6 Sep 2016 15:20:19 +0200 Subject: [PATCH] Remove docs, which were split into java-packaging-howto --- 0001-Don-t-build-and-install-docs.patch | 42 +++++++++++++++++++++++++ javapackages-tools.spec | 18 +++++------ 2 files changed, 49 insertions(+), 11 deletions(-) create mode 100644 0001-Don-t-build-and-install-docs.patch diff --git a/0001-Don-t-build-and-install-docs.patch b/0001-Don-t-build-and-install-docs.patch new file mode 100644 index 0000000..00d2449 --- /dev/null +++ b/0001-Don-t-build-and-install-docs.patch @@ -0,0 +1,42 @@ +From 53ea1889544af0d25b525816eb498a70961e73aa Mon Sep 17 00:00:00 2001 +From: Michael Simacek +Date: Tue, 6 Sep 2016 12:10:03 +0200 +Subject: [PATCH] Don't build and install docs + +--- + build | 2 -- + install | 7 ------- + 2 files changed, 9 deletions(-) + +diff --git a/build b/build +index c2ba01a..af3576d 100755 +--- a/build ++++ b/build +@@ -122,6 +122,4 @@ manpage build-jar-repository + manpage rebuild-jar-repository + manpage shade-jar + +-make -C doc clean all +- + (cd ./python && "${pyinterpreter}" setup.py build) +diff --git a/install b/install +index bd0a94f..2201038 100755 +--- a/install ++++ b/install +@@ -208,13 +208,6 @@ inst_exec target/gradle-local "${bindir}" + inst_data gradle/init.gradle "${datadir}/gradle-local" + inst_data target/gradle_build.7 "${mandir}/man7" + +-exec >files-doc +-inst_doc doc/index.html +-inst_doc doc/images +-inst_doc doc/rpm_project +-inst_doc doc/ideas +-inst_doc doc/java_project +- + exec >files-python + (cd ./python && "${pyinterpreter}" setup.py install -O1 --skip-build --prefix "${prefix}" --root "${DEST}") >&2 + echo "${prefix}/lib/python?.?/site-packages/javapackages" +-- +2.7.4 + diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 3fd6470..b61f3bc 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -9,7 +9,7 @@ Name: javapackages-tools Version: 4.7.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Macros and scripts for Java packaging support @@ -17,6 +17,8 @@ License: BSD URL: https://git.fedorahosted.org/git/javapackages.git Source0: https://fedorahosted.org/released/javapackages/javapackages-%{version}.tar.xz +Patch0: 0001-Don-t-build-and-install-docs.patch + BuildArch: noarch BuildRequires: python3-devel @@ -103,12 +105,6 @@ Obsoletes: python-javapackages < %{version}-%{release} Module for handling, querying and manipulating of various files for Java packaging in Linux distributions -%package doc -Summary: Guide for Java packaging - -%description doc -User guide for Java packaging and using utilities from javapackages-tools - %package -n javapackages-local Summary: Non-essential macros and scripts for Java packaging support Requires: %{name} = %{version}-%{release} @@ -124,7 +120,7 @@ This package provides non-essential macros and scripts to support Java packaging %prep %setup -q -n javapackages-%{version} -sed -i '/fedora-review/d' install +%patch0 -p1 %build %configure --pyinterpreter=%{__python3} @@ -157,10 +153,10 @@ popd %license LICENSE %{python3_sitelib}/javapackages* -%files doc -f files-doc -%license LICENSE - %changelog +* Tue Sep 06 2016 Michael Simacek - 4.7.0-7 +- Remove docs, which were split into java-packaging-howto + * Tue Jul 19 2016 Fedora Release Engineering - 4.7.0-6 - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages