[yaws] Update to 1.92
Lubomir Rintel
lkundrak at fedoraproject.org
Tue Jan 10 13:18:56 UTC 2012
commit c682ac449e36835b2715065397bffc405711d6c5
Author: Lubomir Rintel <lkundrak at v3.sk>
Date: Tue Jan 10 13:50:57 2012 +0100
Update to 1.92
sources | 1 -
yaws-1.88-fhs.patch => yaws-1.92-fhs.patch | 128 ++++++++++----------
...1.85-sysvinit.patch => yaws-1.92-sysvinit.patch | 25 +++--
yaws.spec | 19 ++--
4 files changed, 90 insertions(+), 83 deletions(-)
---
diff --git a/sources b/sources
index 45d3e55..e69de29 100644
--- a/sources
+++ b/sources
@@ -1 +0,0 @@
-681108c95ef5cd6a64d28952b46d54e6 yaws-1.89.tar.gz
diff --git a/yaws-1.88-fhs.patch b/yaws-1.92-fhs.patch
similarity index 60%
rename from yaws-1.88-fhs.patch
rename to yaws-1.92-fhs.patch
index 9954fce..dc89660 100644
--- a/yaws-1.88-fhs.patch
+++ b/yaws-1.92-fhs.patch
@@ -1,51 +1,42 @@
-From f98e56057baf629cf82658f854b5e103f53c0278 Mon Sep 17 00:00:00 2001
-From: Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com>
-Date: Mon, 13 Sep 2010 16:42:17 +0200
-Subject: [PATCH] Install into FHS-compliant hierarchy
+From 644b4d1b59bade953c8c503a0bcd8a550d205155 Mon Sep 17 00:00:00 2001
+From: Filip Andres <filip.andres at gooddata.com>
+Date: Tue, 3 Jan 2012 13:43:17 +0100
+Subject: [PATCH] Install into FHS-compliant hierarchy -- basically move /var/yaws into /var/lib/yaws and ensure logs stay in /var/log. Also, use /usr/lib64 on 64-bit.
-basically move /var/yaws into /var/lib/yaws and ensure logs stay in
-/var/log. Also, use /usr/lib64 on 64-bit.
---
- Makefile | 8 ++++----
- c_src/Makefile | 10 +++++-----
- include.mk.in | 3 ++-
- scripts/Install | 11 ++++++-----
- scripts/Makefile | 8 ++++----
- src/Makefile | 16 ++++++++--------
- 6 files changed, 29 insertions(+), 27 deletions(-)
+ Makefile | 6 +++---
+ c_src/Makefile | 10 +++++-----
+ doc/Makefile | 2 --
+ include.mk.in | 4 +++-
+ scripts/Install | 11 ++++++-----
+ scripts/Makefile | 2 +-
+ scripts/regular-install | 2 +-
+ src/Makefile | 16 ++++++++--------
+ 8 files changed, 27 insertions(+), 26 deletions(-)
diff --git a/Makefile b/Makefile
-index ef0ae16..4a1a026 100644
+index c6802b4..f216538 100644
--- a/Makefile
+++ b/Makefile
-@@ -19,13 +19,13 @@ install: all
- for d in $(SUBDIRS) ; do \
- if [ -f $$d/Makefile ]; then ( cd $$d && $(MAKE) $@ ) || exit 1 ; fi ; \
+@@ -27,13 +27,13 @@ install: all
+ then ( cd $$d && $(MAKE) $@ ) || exit 1 ; \
+ fi ; \
done
- $(INSTALL) -d $(DESTDIR)$(PREFIX)/lib/pkgconfig
- $(INSTALL) -m 644 $(PKGCONFIG_FILES) $(DESTDIR)$(PREFIX)/lib/pkgconfig
-+ $(INSTALL) -d $(DESTDIR)$(LIBDIR)/pkgconfig
-+ $(INSTALL) -m 644 $(PKGCONFIG_FILES) $(DESTDIR)$(LIBDIR)/pkgconfig
++ $(INSTALL) -d $(DESTDIR)$(SYSLIBDIR)/pkgconfig
++ $(INSTALL) -m 644 $(PKGCONFIG_FILES) $(DESTDIR)$(SYSLIBDIR)/pkgconfig
@echo "-------------------------------"
@echo
- @echo "** etc files went into ${ETCDIR}"
- @echo "** executables went into ${prefix}/bin"
+ @echo "** etc files went into ${ETCDIR}"
+ @echo "** executables went into ${prefix}/bin"
- @echo "** library files went into ${prefix}/lib/yaws"
+ @echo "** library files went into ${LIBDIR}/yaws"
@echo "** var files went into ${VARDIR}"
@echo "** default docroot went into ${VARDIR}/yaws/www"
@echo
-@@ -76,7 +76,7 @@ foo:
- @echo
- @echo "** etc files will go into ${ETCDIR}"
- @echo "** executables will go into ${prefix}/bin"
-- @echo "** library file will go into ${prefix}/lib/yaws"
-+ @echo "** library file will go into ${LIBDIR}/yaws"
- @echo "** var files will go into ${VARDIR}"
- @echo
- @echo "--------------------------------"
diff --git a/c_src/Makefile b/c_src/Makefile
-index d7907ab..6707fa5 100644
+index 3b16599..4b053cf 100644
--- a/c_src/Makefile
+++ b/c_src/Makefile
@@ -34,12 +34,12 @@ clean:
@@ -66,15 +57,27 @@ index d7907ab..6707fa5 100644
fi
endif
+diff --git a/doc/Makefile b/doc/Makefile
+index 391dc5b..5fdf374 100644
+--- a/doc/Makefile
++++ b/doc/Makefile
+@@ -43,6 +43,4 @@ clean:
+ rm -f *.ps *.dvi *.log *.aux *.pdf *.toc *.beam 2> /dev/null || true
+
+ install:
+- -install -d $(DESTDIR)$(PREFIX)/share/doc/yaws
+- -cp yaws.pdf $(DESTDIR)$(PREFIX)/share/doc/yaws
+
diff --git a/include.mk.in b/include.mk.in
-index 1fd1ffa..b735d3d 100644
+index 69b8726..34f6d7d 100644
--- a/include.mk.in
+++ b/include.mk.in
-@@ -2,9 +2,10 @@
+@@ -2,9 +2,11 @@
PREFIX = @prefix@
-+LIBDIR = @libdir@
++LIBDIR = @libdir@/erlang/lib
++SYSLIBDIR = @libdir@
prefix = ${PREFIX}
ETCDIR = @sysconfdir@
-VARDIR = @localstatedir@
@@ -83,7 +86,7 @@ index 1fd1ffa..b735d3d 100644
DVILATEX = @DVILATEX@
PDFLATEX = @PDFLATEX@
diff --git a/scripts/Install b/scripts/Install
-index 9662fcd..d66cd1b 100644
+index a0d58fc..870bf51 100755
--- a/scripts/Install
+++ b/scripts/Install
@@ -8,7 +8,8 @@ werl=$3
@@ -121,38 +124,37 @@ index 9662fcd..d66cd1b 100644
## seems gentoo don't like to be installed in /usr/local/etc
## since /sbin/runscript still reads /etc/conf.d
diff --git a/scripts/Makefile b/scripts/Makefile
-index 8c67ff0..9d9a33f 100644
+index 31f62f5..b31e4b7 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
-@@ -38,10 +38,10 @@ local_install: ../bin/yaws
-
+@@ -13,7 +13,7 @@ local_install: ../bin/yaws
+ VARDIR="${HOME}/var" ./local-install true
yaws.conf:
-- @echo PREFIX is $(PREFIX)
-+ @echo LIBDIR is $(LIBDIR)
- cat yaws.conf.template | \
-- ./Subst %yawsdir% "$(PREFIX)/lib/yaws" | \
-- ./Subst %logdir% "$(PREFIX)/var/log/yaws" | \
-+ ./Subst %yawsdir% "$(LIBDIR)/yaws" | \
-+ ./Subst %logdir% "/var/log/yaws" | \
- ./Subst %vardir% "$(VARDIR)" | \
- ./Subst %host% `hostname` | \
- ./Subst %port% 80 | \
-@@ -57,7 +57,7 @@ install: .install
- .install:
- -rm -rf /tmp/yaws 2> /dev/null
- sh ./Install $(PREFIX) $(ERL) \
-- $(WERL) $(ETCDIR)/ $(VARDIR)/ $(ERLBINDIR)/ $(DESTDIR)
-+ $(WERL) $(ETCDIR)/ $(VARDIR)/ $(ERLBINDIR)/ $(LIBDIR)/ $(DESTDIR)
- @if [ -f $(DESTDIR)$(ETCDIR)/yaws/yaws.conf ]; \
- then echo "Keeping old config file "; \
- cp yaws.conf $(DESTDIR)$(ETCDIR)/yaws/yaws.conf.template; \
+- YAWSDIR='$(PREFIX)/lib/yaws' LOGDIR='$(PREFIX)/var/log/yaws' \
++ YAWSDIR='$(LIBDIR)/yaws' LOGDIR='/var/log/yaws' \
+ VARDIR='$(VARDIR)' PORT=80 DOCROOT='$(VARDIR)/yaws/www' \
+ CERTDIR='$(ETCDIR)/yaws' SSLPORT=443 ./gen-yaws-conf > $@
+
+diff --git a/scripts/regular-install b/scripts/regular-install
+index 2286380..837343f 100755
+--- a/scripts/regular-install
++++ b/scripts/regular-install
+@@ -8,7 +8,7 @@ rm -rf /tmp/yaws 2>/dev/null
+ set -e
+
+ ./Install "${PREFIX}" "${ERL}" "${WERL}" "${ETCDIR}/" \
+- "${VARDIR}/" "${ERLBINDIR}/" "${DESTDIR}"
++ "${VARDIR}/" "${ERLBINDIR}/" "${LIBDIR}" "${DESTDIR}"
+
+ conffile="${DESTDIR}${ETCDIR}/yaws/yaws.conf"
+ if [ -f "$conffile" ]; then
diff --git a/src/Makefile b/src/Makefile
-index f208602..bd06406 100644
+index 03caf1a..634c37f 100644
--- a/src/Makefile
+++ b/src/Makefile
-@@ -114,15 +114,15 @@ clean:
- rm -f $(EBIN_FILES) yaws_generated.erl charset.def mime_types.erl yaws_configure.hrl ../ebin/*.beam
+@@ -111,15 +111,15 @@ clean:
+ mime_types.erl yaws_configure.hrl mime_type_c.beam
install: regen all docsinstall
- $(INSTALL) -d $(DESTDIR)$(PREFIX)/lib/yaws/examples/ebin
@@ -164,7 +166,7 @@ index f208602..bd06406 100644
+ $(INSTALL) -d $(DESTDIR)$(LIBDIR)/yaws/examples/include
+ $(INSTALL) -d $(DESTDIR)$(LIBDIR)/yaws/ebin
+ $(INSTALL) -d $(DESTDIR)$(LIBDIR)/yaws/priv
-+ $(INSTALL) -d $(DESTDIR)$/var/log/yaws
++ $(INSTALL) -d $(DESTDIR)/var/log/yaws
$(INSTALL) -d $(DESTDIR)$(VARDIR)/yaws/ebin
- (cd ..; tar cf - ebin ) | (cd $(DESTDIR)$(PREFIX)/lib/yaws; tar xf - )
- (cd ..; tar cf - include ) | (cd $(DESTDIR)$(PREFIX)/lib/yaws; tar xf - )
@@ -172,9 +174,9 @@ index f208602..bd06406 100644
+ (cd ..; tar cf - ebin ) | (cd $(DESTDIR)$(LIBDIR)/yaws; tar xf - )
+ (cd ..; tar cf - include ) | (cd $(DESTDIR)$(LIBDIR)/yaws; tar xf - )
+ (cd ..; tar cf - priv/*.xsd ) | (cd $(DESTDIR)$(LIBDIR)/yaws; tar xf - )
- $(RM) yaws_generated.erl ../ebin/yaws_generated.beam 2>/dev/null || true
docsinstall:
+ $(INSTALL) -d $(DESTDIR)$(VARDIR)/yaws/www
--
-1.7.2.1
+1.7.4.1
diff --git a/yaws-1.85-sysvinit.patch b/yaws-1.92-sysvinit.patch
similarity index 52%
rename from yaws-1.85-sysvinit.patch
rename to yaws-1.92-sysvinit.patch
index d7b11f2..b14ec68 100644
--- a/yaws-1.85-sysvinit.patch
+++ b/yaws-1.92-sysvinit.patch
@@ -1,11 +1,17 @@
-From: Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com>
+From c831a206727b904e4100d180e2967e7f5132f309 Mon Sep 17 00:00:00 2001
+From: Filip Andres <filip.andres at gooddata.com>
+Date: Tue, 3 Jan 2012 13:41:50 +0100
+Subject: [PATCH] Do not enable the service by default.
+ More robustly determine if we're running.
-Do not enable the service by default.
-More robustly determine if we're running.
+---
+ scripts/redhat/yaws.init.d | 7 ++++---
+ 1 files changed, 4 insertions(+), 3 deletions(-)
-diff -up yaws-1.85/scripts/redhat/yaws.init.d.sysvinit yaws-1.85/scripts/redhat/yaws.init.d
---- yaws-1.85/scripts/redhat/yaws.init.d.sysvinit 2009-10-17 23:07:14.000000000 +0200
-+++ yaws-1.85/scripts/redhat/yaws.init.d 2009-11-02 21:43:14.000000000 +0100
+diff --git a/scripts/redhat/yaws.init.d b/scripts/redhat/yaws.init.d
+index 4b7a911..09d51cb 100755
+--- a/scripts/redhat/yaws.init.d
++++ b/scripts/redhat/yaws.init.d
@@ -4,7 +4,7 @@
#
# config: /etc/yaws.conf
@@ -28,7 +34,7 @@ diff -up yaws-1.85/scripts/redhat/yaws.init.d.sysvinit yaws-1.85/scripts/redhat/
;;
status)
- $yaws -S
-+ [ -f ${HOME}/.yaws/yaws/default/CTL ] && $yaws -S
++ [ -f ${HOME}/.yaws/yaws/default/CTL ] && $yaws -S
RETVAL=$?
;;
restart)
@@ -37,7 +43,10 @@ diff -up yaws-1.85/scripts/redhat/yaws.init.d.sysvinit yaws-1.85/scripts/redhat/
;;
condrestart)
- if [ -f /tmp/yaws.ctl ] ; then
-+ if [ -f ${HOME}/.yaws/yaws/default/CTL ] && $yaws -S >/dev/null 2>&1; then
++ if [ -f ${HOME}/.yaws/yaws/default/CTL ] && $yaws -S >/dev/null 2>&1 ; then
stop
start
fi
+--
+1.7.4.1
+
diff --git a/yaws.spec b/yaws.spec
index 5bf9578..522c276 100644
--- a/yaws.spec
+++ b/yaws.spec
@@ -4,8 +4,8 @@
%bcond_without docs
Name: yaws
-Version: 1.89
-Release: 4%{?dist}
+Version: 1.92
+Release: 1%{?dist}
Summary: Web server for dynamic content written in Erlang
Group: System Environment/Daemons
# BSD: see LICENSE
@@ -18,10 +18,8 @@ License: BSD and ERPL and LGPLv2 and Copyright only and W3C
URL: http://yaws.hyber.org/
Source0: http://yaws.hyber.org/download/%{name}-%{version}.tar.gz
Source1: yaws.logrotate
-Patch0: yaws-1.85-sysvinit.patch
-Patch1: yaws-1.88-fhs.patch
-# backported from upstream
-Patch3: yaws-0003-Add-yaws_dime.erl-to-the-list-of-modules-to-compile.patch
+Patch0: yaws-1.92-sysvinit.patch
+Patch1: yaws-1.92-fhs.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: erlang-erts
@@ -71,7 +69,6 @@ This package contains a pkg-config configuration for %{name}.
%setup -q
%patch0 -p1 -b .sysvinit
%patch1 -p1 -b .fhs
-%patch3 -p1 -b .missing_module
# This requires egssapi which is not yet available
rm -f src/authmod_gssapi.erl
@@ -86,7 +83,7 @@ find . -name '*.dia' -delete
%build
-%configure --libdir=%{_libdir}/erlang/lib
+%configure
make %{?_smp_mflags} all
%if %{with docs}
# fails to build with smp_mflags sometimes
@@ -108,9 +105,6 @@ rmdir $RPM_BUILD_ROOT%{_sysconfdir}/init.d
install -d $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
install -p -m0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/yaws
-mkdir -p $RPM_BUILD_ROOT%{_libdir}
-mv $RPM_BUILD_ROOT%{_libdir}/erlang/lib/pkgconfig $RPM_BUILD_ROOT%{_libdir}
-
%clean
rm -rf $RPM_BUILD_ROOT
@@ -163,6 +157,9 @@ fi
%changelog
+* Tue Jan 03 2012 Lubomir Rintel (GoodData) <lkundrak at v3.sk> - 1.92-1
+- Update
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.89-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
More information about the scm-commits
mailing list