[couchdb] Cleaned up spec-file a bit
Peter Lemenkov
peter at fedoraproject.org
Thu Aug 26 10:23:01 UTC 2010
commit d5ccc5fc4e4b128e1289375062c05add83b5ef10
Author: Peter Lemenkov <lemenkov at gmail.com>
Date: Thu Aug 26 14:22:48 2010 +0400
Cleaned up spec-file a bit
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
couchdb-0001-Force-init-script-installation.patch | 4 +-
...db-0002-Install-into-erllibdir-by-default.patch | 4 +-
...-0003-Remove-bundled-erlang-oauth-library.patch | 4 +-
...b-0004-Remove-bundled-erlang-etap-library.patch | 4 +-
couchdb-0005-Remove-bundled-mochiweb-library.patch | 4 +-
couchdb-0006-Remove-bundled-ibrowse-library.patch | 4 +-
...b-0007-Workaround-for-system-wide-ibrowse.patch | 4 +-
couchdb-0008-Remove-pid-file-after-stop.patch | 4 +-
...DB-while-it-was-being-opened-would-crash-.patch | 4 +-
couchdb-0010-Do-not-install-gzipped-docs.patch | 220 ++++++++++++++++++++
...ix-respawn-timeout-to-match-default-value.patch | 24 ++
couchdb.spec | 16 +-
12 files changed, 270 insertions(+), 26 deletions(-)
---
diff --git a/couchdb-0001-Force-init-script-installation.patch b/couchdb-0001-Force-init-script-installation.patch
index 11688a3..0419aa9 100644
--- a/couchdb-0001-Force-init-script-installation.patch
+++ b/couchdb-0001-Force-init-script-installation.patch
@@ -1,7 +1,7 @@
-From b8662ca68f25693371f446cab5e8f0e31a89d6f6 Mon Sep 17 00:00:00 2001
+From 3e55695afb015dbc4e478739a1c467bf7ad859b0 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Thu, 27 May 2010 15:17:20 +0400
-Subject: [PATCH 1/9] Force init script installation
+Subject: [PATCH 01/11] Force init script installation
---
configure.ac | 16 +++-------------
diff --git a/couchdb-0002-Install-into-erllibdir-by-default.patch b/couchdb-0002-Install-into-erllibdir-by-default.patch
index a9c6290..17f65e5 100644
--- a/couchdb-0002-Install-into-erllibdir-by-default.patch
+++ b/couchdb-0002-Install-into-erllibdir-by-default.patch
@@ -1,7 +1,7 @@
-From 6ef6880ef3bc48d95fb23752e63bbff84d737cdd Mon Sep 17 00:00:00 2001
+From 9fbd5b93c786bfd0454679147c253ad432fad46f Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Thu, 27 May 2010 15:18:29 +0400
-Subject: [PATCH 2/9] Install into erllibdir by default
+Subject: [PATCH 02/11] Install into erllibdir by default
---
configure | 4 ++--
diff --git a/couchdb-0003-Remove-bundled-erlang-oauth-library.patch b/couchdb-0003-Remove-bundled-erlang-oauth-library.patch
index e5e3fc4..a9896d9 100644
--- a/couchdb-0003-Remove-bundled-erlang-oauth-library.patch
+++ b/couchdb-0003-Remove-bundled-erlang-oauth-library.patch
@@ -1,7 +1,7 @@
-From 2aae1a873cec7abe85cac3785c1c595df9dbf0bb Mon Sep 17 00:00:00 2001
+From 85a48df82cd6add8fd40f0ef7e548cfbc9fb447e Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Wed, 14 Jul 2010 17:57:54 +0400
-Subject: [PATCH 3/9] Remove bundled erlang-oauth library
+Subject: [PATCH 03/11] Remove bundled erlang-oauth library
---
configure | 3 -
diff --git a/couchdb-0004-Remove-bundled-erlang-etap-library.patch b/couchdb-0004-Remove-bundled-erlang-etap-library.patch
index 4177f65..b98fd8c 100644
--- a/couchdb-0004-Remove-bundled-erlang-etap-library.patch
+++ b/couchdb-0004-Remove-bundled-erlang-etap-library.patch
@@ -1,7 +1,7 @@
-From 81177309895f5b3dd096a936231eabd42c8d15e5 Mon Sep 17 00:00:00 2001
+From 6c9b556d411d14e9dadd550b6b8ff9088cf5bfbf Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Wed, 14 Jul 2010 18:00:03 +0400
-Subject: [PATCH 4/9] Remove bundled erlang-etap library
+Subject: [PATCH 04/11] Remove bundled erlang-etap library
---
configure | 3 -
diff --git a/couchdb-0005-Remove-bundled-mochiweb-library.patch b/couchdb-0005-Remove-bundled-mochiweb-library.patch
index d10c187..e7dd308 100644
--- a/couchdb-0005-Remove-bundled-mochiweb-library.patch
+++ b/couchdb-0005-Remove-bundled-mochiweb-library.patch
@@ -1,7 +1,7 @@
-From 7f55a86e3907e11058fdf13b7014c3ae9019ab57 Mon Sep 17 00:00:00 2001
+From bad54224de05d8ba1f2ec2b270b1b61b9d9eab7e Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Wed, 14 Jul 2010 18:01:45 +0400
-Subject: [PATCH 5/9] Remove bundled mochiweb library
+Subject: [PATCH 05/11] Remove bundled mochiweb library
---
configure | 3 -
diff --git a/couchdb-0006-Remove-bundled-ibrowse-library.patch b/couchdb-0006-Remove-bundled-ibrowse-library.patch
index b1bea3e..3d599c2 100644
--- a/couchdb-0006-Remove-bundled-ibrowse-library.patch
+++ b/couchdb-0006-Remove-bundled-ibrowse-library.patch
@@ -1,7 +1,7 @@
-From ea69134fb0a3efd6db259e32f4a08b1d28f8e6fd Mon Sep 17 00:00:00 2001
+From 179b20af1a2dff0f8976e4e0071c4b31c04bcfb8 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Fri, 6 Aug 2010 16:05:02 +0400
-Subject: [PATCH 6/9] Remove bundled ibrowse library
+Subject: [PATCH 06/11] Remove bundled ibrowse library
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
diff --git a/couchdb-0007-Workaround-for-system-wide-ibrowse.patch b/couchdb-0007-Workaround-for-system-wide-ibrowse.patch
index 082253b..1249b01 100644
--- a/couchdb-0007-Workaround-for-system-wide-ibrowse.patch
+++ b/couchdb-0007-Workaround-for-system-wide-ibrowse.patch
@@ -1,7 +1,7 @@
-From 7051f964acf2fd831b2ad67617f0d67125284460 Mon Sep 17 00:00:00 2001
+From 279688f94b56ddd85a6311c426780c6eda787edf Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Tue, 8 Jun 2010 17:30:49 +0400
-Subject: [PATCH 7/9] Workaround for system-wide ibrowse
+Subject: [PATCH 07/11] Workaround for system-wide ibrowse
---
src/couchdb/couch_rep_changes_feed.erl | 2 +-
diff --git a/couchdb-0008-Remove-pid-file-after-stop.patch b/couchdb-0008-Remove-pid-file-after-stop.patch
index 95ea72a..6f71b25 100644
--- a/couchdb-0008-Remove-pid-file-after-stop.patch
+++ b/couchdb-0008-Remove-pid-file-after-stop.patch
@@ -1,7 +1,7 @@
-From 6362962685a23e9442bac2dd5f27ef6ffda626d4 Mon Sep 17 00:00:00 2001
+From 16ee55f5fa6d1e8f85de6fd17d4195e176bfca0c Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Mon, 7 Jun 2010 15:08:42 +0400
-Subject: [PATCH 8/9] Remove pid-file after stop
+Subject: [PATCH 08/11] Remove pid-file after stop
---
bin/couchdb.tpl.in | 4 +---
diff --git a/couchdb-0009-deleting-a-DB-while-it-was-being-opened-would-crash-.patch b/couchdb-0009-deleting-a-DB-while-it-was-being-opened-would-crash-.patch
index e204698..0274891 100644
--- a/couchdb-0009-deleting-a-DB-while-it-was-being-opened-would-crash-.patch
+++ b/couchdb-0009-deleting-a-DB-while-it-was-being-opened-would-crash-.patch
@@ -1,7 +1,7 @@
-From fb6a51831c51a21cb76be78921a24e99d3b55347 Mon Sep 17 00:00:00 2001
+From b1ed77ec73f756b820e7c8269cb126ffa46a1bbc Mon Sep 17 00:00:00 2001
From: Adam Kocoloski <kocolosk at apache.org>
Date: Sun, 11 Jul 2010 01:00:50 +0000
-Subject: [PATCH 9/9] deleting a DB while it was being opened would crash couch_server
+Subject: [PATCH 09/11] deleting a DB while it was being opened would crash couch_server
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@962964 13f79535-47bb-0310-9956-ffa450edef68
---
diff --git a/couchdb-0010-Do-not-install-gzipped-docs.patch b/couchdb-0010-Do-not-install-gzipped-docs.patch
new file mode 100644
index 0000000..0228c8c
--- /dev/null
+++ b/couchdb-0010-Do-not-install-gzipped-docs.patch
@@ -0,0 +1,220 @@
+From 4d79cfe314d2b08a46cf25460402e8d7db788576 Mon Sep 17 00:00:00 2001
+From: Peter Lemenkov <lemenkov at gmail.com>
+Date: Thu, 26 Aug 2010 13:07:33 +0400
+Subject: [PATCH 10/11] Do not install gzipped docs
+
+Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
+---
+ Makefile.am | 52 +-----------------------------------
+ Makefile.in | 85 +++++------------------------------------------------------
+ 2 files changed, 8 insertions(+), 129 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 8e16baf..06f7be9 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -14,21 +14,7 @@ SUBDIRS = bin etc src share test var utils
+
+ ACLOCAL_AMFLAGS = -I m4
+
+-localdoc_DATA = \
+- AUTHORS.gz \
+- BUGS.gz \
+- CHANGES.gz \
+- DEVELOPERS.gz \
+- INSTALL.gz \
+- INSTALL.Unix.gz \
+- INSTALL.Windows.gz \
+- LICENSE.gz \
+- NEWS.gz \
+- NOTICE.gz \
+- README.gz \
+- THANKS.gz
+-
+-DISTCLEANFILES = $(localdoc_DATA)
++DISTCLEANFILES =
+
+ EXTRA_DIST = \
+ AUTHORS \
+@@ -45,42 +31,6 @@ EXTRA_DIST = \
+ THANKS \
+ license.skip
+
+-AUTHORS.gz: $(top_srcdir)/AUTHORS
+- -gzip -9 < $< > $@
+-
+-BUGS.gz: $(top_srcdir)/BUGS
+- -gzip -9 < $< > $@
+-
+-CHANGES.gz: $(top_srcdir)/CHANGES
+- -gzip -9 < $< > $@
+-
+-DEVELOPERS.gz: $(top_srcdir)/DEVELOPERS
+- -gzip -9 < $< > $@
+-
+-INSTALL.gz: $(top_srcdir)/INSTALL
+- -gzip -9 < $< > $@
+-
+-INSTALL.Unix.gz: $(top_srcdir)/INSTALL.Unix
+- -gzip -9 < $< > $@
+-
+-INSTALL.Windows.gz: $(top_srcdir)/INSTALL.Windows
+- -gzip -9 < $< > $@
+-
+-LICENSE.gz: $(top_srcdir)/LICENSE
+- -gzip -9 < $< > $@
+-
+-NEWS.gz: $(top_srcdir)/NEWS
+- -gzip -9 < $< > $@
+-
+-NOTICE.gz: $(top_srcdir)/NOTICE
+- -gzip -9 < $< > $@
+-
+-README.gz: $(top_srcdir)/README
+- -gzip -9 < $< > $@
+-
+-THANKS.gz: $(top_srcdir)/THANKS
+- -gzip -9 < $< > $@
+-
+ check: dev
+ $(top_builddir)/test/etap/run
+
+diff --git a/Makefile.in b/Makefile.in
+index 0e9f10a..bc76e26 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -85,7 +85,7 @@ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+ am__installdirs = "$(DESTDIR)$(localdocdir)"
+-DATA = $(localdoc_DATA)
++DATA =
+ RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+ distclean-recursive maintainer-clean-recursive
+ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+@@ -290,21 +290,8 @@ version_revision = @version_revision@
+ version_stage = @version_stage@
+ SUBDIRS = bin etc src share test var utils
+ ACLOCAL_AMFLAGS = -I m4
+-localdoc_DATA = \
+- AUTHORS.gz \
+- BUGS.gz \
+- CHANGES.gz \
+- DEVELOPERS.gz \
+- INSTALL.gz \
+- INSTALL.Unix.gz \
+- INSTALL.Windows.gz \
+- LICENSE.gz \
+- NEWS.gz \
+- NOTICE.gz \
+- README.gz \
+- THANKS.gz
+-
+-DISTCLEANFILES = $(localdoc_DATA)
++
++DISTCLEANFILES =
+ EXTRA_DIST = \
+ AUTHORS \
+ BUGS \
+@@ -384,27 +371,6 @@ clean-libtool:
+
+ distclean-libtool:
+ -rm -f libtool config.lt
+-install-localdocDATA: $(localdoc_DATA)
+- @$(NORMAL_INSTALL)
+- test -z "$(localdocdir)" || $(MKDIR_P) "$(DESTDIR)$(localdocdir)"
+- @list='$(localdoc_DATA)'; test -n "$(localdocdir)" || list=; \
+- for p in $$list; do \
+- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- echo "$$d$$p"; \
+- done | $(am__base_list) | \
+- while read files; do \
+- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(localdocdir)'"; \
+- $(INSTALL_DATA) $$files "$(DESTDIR)$(localdocdir)" || exit $$?; \
+- done
+-
+-uninstall-localdocDATA:
+- @$(NORMAL_UNINSTALL)
+- @list='$(localdoc_DATA)'; test -n "$(localdocdir)" || list=; \
+- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+- test -n "$$files" || exit 0; \
+- echo " ( cd '$(DESTDIR)$(localdocdir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(localdocdir)" && rm -f $$files
+-
+ # This directory's subdirectories are mostly independent; you can cd
+ # into them and run `make' without going through this Makefile.
+ # To change the values of `make' variables: instead of editing Makefiles,
+@@ -774,7 +740,7 @@ info: info-recursive
+
+ info-am:
+
+-install-data-am: install-localdocDATA
++install-data-am:
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) install-data-hook
+ install-dvi: install-dvi-recursive
+@@ -821,7 +787,7 @@ ps: ps-recursive
+
+ ps-am:
+
+-uninstall-am: uninstall-localdocDATA
++uninstall-am:
+
+ .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
+ ctags-recursive install-am install-data-am install-strip \
+@@ -837,50 +803,13 @@ uninstall-am: uninstall-localdocDATA
+ html-am info info-am install install-am install-data \
+ install-data-am install-data-hook install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+- install-info install-info-am install-localdocDATA install-man \
++ install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ installdirs-am maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+- ps ps-am tags tags-recursive uninstall uninstall-am \
+- uninstall-localdocDATA
+-
+-
+-AUTHORS.gz: $(top_srcdir)/AUTHORS
+- -gzip -9 < $< > $@
+-
+-BUGS.gz: $(top_srcdir)/BUGS
+- -gzip -9 < $< > $@
+-
+-CHANGES.gz: $(top_srcdir)/CHANGES
+- -gzip -9 < $< > $@
+-
+-DEVELOPERS.gz: $(top_srcdir)/DEVELOPERS
+- -gzip -9 < $< > $@
+-
+-INSTALL.gz: $(top_srcdir)/INSTALL
+- -gzip -9 < $< > $@
+-
+-INSTALL.Unix.gz: $(top_srcdir)/INSTALL.Unix
+- -gzip -9 < $< > $@
+-
+-INSTALL.Windows.gz: $(top_srcdir)/INSTALL.Windows
+- -gzip -9 < $< > $@
+-
+-LICENSE.gz: $(top_srcdir)/LICENSE
+- -gzip -9 < $< > $@
+-
+-NEWS.gz: $(top_srcdir)/NEWS
+- -gzip -9 < $< > $@
+-
+-NOTICE.gz: $(top_srcdir)/NOTICE
+- -gzip -9 < $< > $@
+-
+-README.gz: $(top_srcdir)/README
+- -gzip -9 < $< > $@
++ ps ps-am tags tags-recursive uninstall uninstall-am
+
+-THANKS.gz: $(top_srcdir)/THANKS
+- -gzip -9 < $< > $@
+
+ check: dev
+ $(top_builddir)/test/etap/run
+--
+1.7.2.1
+
diff --git a/couchdb-0011-Fix-respawn-timeout-to-match-default-value.patch b/couchdb-0011-Fix-respawn-timeout-to-match-default-value.patch
new file mode 100644
index 0000000..99cce6e
--- /dev/null
+++ b/couchdb-0011-Fix-respawn-timeout-to-match-default-value.patch
@@ -0,0 +1,24 @@
+From 3dae034d5c30263c9d28c060422f89847cdb3c53 Mon Sep 17 00:00:00 2001
+From: Peter Lemenkov <lemenkov at gmail.com>
+Date: Thu, 26 Aug 2010 13:22:56 +0400
+Subject: [PATCH 11/11] Fix respawn timeout to match default value
+
+Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
+---
+ etc/default/couchdb | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/etc/default/couchdb b/etc/default/couchdb
+index c2a3f2a..f589c0a 100644
+--- a/etc/default/couchdb
++++ b/etc/default/couchdb
+@@ -3,5 +3,5 @@
+ COUCHDB_USER=couchdb
+ COUCHDB_STDOUT_FILE=/dev/null
+ COUCHDB_STDERR_FILE=/dev/null
+-COUCHDB_RESPAWN_TIMEOUT=5
++COUCHDB_RESPAWN_TIMEOUT=0
+ COUCHDB_OPTIONS=
+--
+1.7.2.1
+
diff --git a/couchdb.spec b/couchdb.spec
index 43f8b03..d7d4c51 100644
--- a/couchdb.spec
+++ b/couchdb.spec
@@ -4,7 +4,7 @@
Name: couchdb
Version: 1.0.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A document database server, accessible via a RESTful JSON API
Group: Applications/Databases
@@ -21,6 +21,8 @@ Patch6: couchdb-0006-Remove-bundled-ibrowse-library.patch
Patch7: couchdb-0007-Workaround-for-system-wide-ibrowse.patch
Patch8: couchdb-0008-Remove-pid-file-after-stop.patch
Patch9: couchdb-0009-deleting-a-DB-while-it-was-being-opened-would-crash-.patch
+Patch10: couchdb-0010-Do-not-install-gzipped-docs.patch
+Patch11: couchdb-0011-Fix-respawn-timeout-to-match-default-value.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: curl-devel
@@ -35,7 +37,6 @@ BuildRequires: libicu-devel
# For /usr/bin/prove
BuildRequires: perl(Test::Harness)
-
Requires: erlang-crypto
Requires: erlang-erts
Requires: erlang-ibrowse
@@ -75,6 +76,8 @@ JavaScript acting as the default view definition language.
%patch7 -p1 -b .workaround_for_ssl
%patch8 -p1 -b .remove_pid_file
%patch9 -p1 -b .fix_crash
+%patch10 -p1 -b .gzipped_docs
+%patch11 -p1 -b .fix_respawn
# Restore original timestamps to avoid reconfiguring
touch -r configure.ac.initenabled configure.ac
touch -r configure.fix_lib_path configure
@@ -97,12 +100,6 @@ rm $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/couchdb
# Use /etc/sysconfig instead of /etc/default
mv $RPM_BUILD_ROOT%{_sysconfdir}/{default,sysconfig}
-# Remove wrongly placed doc files
-rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/couchdb
-
-# fix respawn timeout to match default value
-sed -i s,^COUCHDB_RESPAWN_TIMEOUT=5,COUCHDB_RESPAWN_TIMEOUT=0,g $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/couchdb
-
%check
make check || exit 1
@@ -154,6 +151,9 @@ fi
%changelog
+* Thu Aug 26 2010 Peter Lemenkov <lemenkov at gmail.com> 1.0.1-2
+- Cleaned up spec-file a bit
+
* Fri Aug 6 2010 Peter Lemenkov <lemenkov at gmail.com> 1.0.1-1
- Ver. 1.0.1
More information about the scm-commits
mailing list