OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/thttpd?expand=0&rev=4

thttpd-SuSE.tar.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dd96062d39b17433a52b66f2783bb2b5ebf48af68304386913b73ef4406c99d2
-size 60713
+oid sha256:cf20904c0d4328c34e877109ae59c12e2f85fb1455cb5facdf24a26d26253900
+size 61844

thttpd.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Jun  1 19:34:10 CEST 2007 - pcerny@suse.cz
+
+- added config file (/etc/thttpd.conf)
+
 -------------------------------------------------------------------
 Fri Feb 16 17:36:35 CET 2007 - mvaner@suse.cz
 

thttpd.spec

@@ -10,13 +10,13 @@
 
 
 Name:           thttpd
-License:        X11/MIT
+License:        BSD License and BSD-like
 Group:          Productivity/Networking/Web/Servers
 Provides:       http_daemon 
 PreReq:         %fillup_prereq %insserv_prereq permissions
 Autoreqprov:    on
 Version:        2.25b
-Release:        69
+Release:        84
 Source:         %{name}-%{version}.tar.bz2
 Source1:        %{name}-SuSE.tar.bz2
 Patch0:         %{name}-%{version}-configure.patch
@@ -49,8 +49,6 @@ Authors:
 --------
     jef@acme.com
 
-%define prefix   /usr
-%define sysconfdir /etc
 %define serverroot /srv/www
 %prep
 %setup -q -a 1
@@ -68,10 +66,11 @@ Authors:
 %patch11
 
 %build
-for i in README.SuSE SuSE/etc/init.d/thttpd; do
-sed -i "s @SRVROOT@ %{serverroot}/htdocs " $i
-done
+# update server root path
+sed -i "s@__SRVROOT__@%{serverroot}/htdocs@g" README.SuSE SuSE/etc/thttpd.conf
+sed -i "s@__PREFIX__@%{_prefix}@g;s@__SYSCONFDIR__@%{_sysconfdir}@g" SuSE/etc/init.d/thttpd
 chmod 744 SuSE/etc/init.d/thttpd
+chmod 644 SuSE/etc/thttpd.conf
 %{suse_update_config}
 mv aclocal.m4 acinclude.m4
 libtoolize --force
@@ -80,9 +79,9 @@ autoconf -f
 V_CCOPT="$RPM_OPT_FLAGS -Wall" \
 	./configure \
 	--mandir=%{_mandir} \
-	--prefix=%{prefix} \
+	--prefix=%{_prefix} \
 	--infodir=%{_infodir} \
-	--sysconfdir=%{sysconfdir}
+	--sysconfdir=%{_sysconfdir}
 %ifarch s390 s390x
 make F_PIE="-fPIE"
 %else
@@ -90,17 +89,17 @@ make F_PIE="-fpie"
 %endif
 
 %install
-install -d $RPM_BUILD_ROOT/usr/bin \
-	   $RPM_BUILD_ROOT/usr/sbin \
-           $RPM_BUILD_ROOT/%{_mandir}/man1 \
-           $RPM_BUILD_ROOT/%{_mandir}/man8 \
-           $RPM_BUILD_ROOT%{serverroot}/htdocs/users
-make DESTDIR=$RPM_BUILD_ROOT/ install
-cp -a SuSE/* $RPM_BUILD_ROOT
+install -d %{buildroot}/usr/bin \
+	   %{buildroot}/usr/sbin \
+           %{buildroot}%{_mandir}/man1 \
+           %{buildroot}%{_mandir}/man8 \
+           %{buildroot}%{serverroot}/htdocs/users
+make DESTDIR=%{buildroot}/ install
+cp -a SuSE/* %{buildroot}
 sed "s@THTTPD-RELEASE@%{version}@" \
-     $RPM_BUILD_ROOT%{serverroot}/htdocs/index.html.template > \
-     $RPM_BUILD_ROOT%{serverroot}/htdocs/index.html
-rm -f $RPM_BUILD_ROOT%{serverroot}/htdocs/index.html.template
+     %{buildroot}%{serverroot}/htdocs/index.html.template > \
+     %{buildroot}%{serverroot}/htdocs/index.html
+rm -f %{buildroot}%{serverroot}/htdocs/index.html.template
 
 %post
 %{fillup_and_insserv thttpd}
@@ -117,7 +116,7 @@ rm -f $RPM_BUILD_ROOT%{serverroot}/htdocs/index.html.template
 %{insserv_cleanup}
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf "%{buildroot}"
 
 %files
 %defattr(-, root, root)
@@ -131,8 +130,11 @@ rm -rf $RPM_BUILD_ROOT
 /usr/sbin/*
 /usr/share/man/*/*
 %config /etc/init.d/thttpd
+%config /etc/thttpd.conf
 
 %changelog
+* Fri Jun 01 2007 - pcerny@suse.cz
+- added config file (/etc/thttpd.conf)
 * Fri Feb 16 2007 - mvaner@suse.cz
 - Adding check for zero length
   - from Marcus Meissner