diff options
| author | Elan Ruusamäe | 2019-02-18 09:15:09 (GMT) |
|---|---|---|
| committer | Elan Ruusamäe | 2019-02-18 09:15:29 (GMT) |
| commit | cf132c90bc5a276b683e8906120b976d27ef5f45 (patch) | |
| tree | 4490f7f369c8ab7b19cd29de40baed37caa30bb9 | |
| parent | d352347d57a3ff2390c28eab7c7f7ac33899fdc4 (diff) | |
| download | ApacheJServ-cf132c90bc5a276b683e8906120b976d27ef5f45.zip ApacheJServ-cf132c90bc5a276b683e8906120b976d27ef5f45.tar.gz | |
fix make install overwriting it's own files
install: will not overwrite just-created ... ...
| -rw-r--r-- | ApacheJServ.spec | 4 | ||||
| -rw-r--r-- | doc-overwrite.patch | 22 |
2 files changed, 25 insertions, 1 deletions
diff --git a/ApacheJServ.spec b/ApacheJServ.spec index a0527d0..fafc780 100644 --- a/ApacheJServ.spec +++ b/ApacheJServ.spec @@ -5,7 +5,7 @@ Summary: Servlet engine with support for the leading web server Summary(pl.UTF-8): Silnik serwletów ze wsparciem dla wiodącego serwera WWW Name: ApacheJServ Version: 1.1.2 -Release: 9 +Release: 10 License: freely distributable & usable Group: Networking/Daemons Source0: http://java.apache.org/jserv/dist/%{name}-%{version}.tar.gz @@ -18,6 +18,7 @@ Patch0: %{name}-enable-secret.patch Patch1: %{name}-ac.patch Patch2: %{name}-jre-env.patch Patch3: %{name}-config.patch +Patch4: doc-overwrite.patch URL: http://archive.apache.org/dist/java/jserv/ BuildRequires: apache1-devel >= 1.3.9-8 BuildRequires: autoconf @@ -82,6 +83,7 @@ Moduł JServ dla Apache'a. %patch1 -p0 %patch2 -p1 %patch3 -p1 +%patch4 -p1 # servlet-2.0 is the highest version the jserv code compiles with servlet_jar=$(find-jar servlet-2.0) diff --git a/doc-overwrite.patch b/doc-overwrite.patch new file mode 100644 index 0000000..b6da840 --- /dev/null +++ b/doc-overwrite.patch @@ -0,0 +1,22 @@ +--- /home/users/glen/rpm/BUILD/x86_64-linux/ApacheJServ-1.1.2/docs/Makefile.am~ 2019-02-18 11:14:18.000000000 +0200 ++++ /home/users/glen/rpm/BUILD/x86_64-linux/ApacheJServ-1.1.2/docs/Makefile.am 2019-02-18 11:14:22.603006830 +0200 +@@ -7,10 +7,16 @@ + protocol/*.html \ + future/*.html + +-DOCFILES = $(strip $(shell ls $(EXTRA_DIST))) +- + docdir = ${prefix}/docs +-doc_DATA= $(DOCFILES) ++doc_DATA = *.html *.txt ++doc_imagesdir = ${prefix}/docs/images ++doc_images_DATA = images/*.gif ++doc_installdir = ${prefix}/docs/install ++doc_install_DATA = install/*.html ++doc_protocoldir = ${prefix}/docs/protocol ++doc_protocol_DATA = protocol/*.html ++doc_futuredir = ${prefix}/docs/future ++doc_future_DATA = future/*.html + + create-dirs : + $(mkinstalldirs) $(DESTDIR)$(docdir) \ |