diff --git a/thttpd-SuSE.tar.bz2 b/thttpd-SuSE.tar.bz2 index 75e26e1..da22526 100644 --- a/thttpd-SuSE.tar.bz2 +++ b/thttpd-SuSE.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cf20904c0d4328c34e877109ae59c12e2f85fb1455cb5facdf24a26d26253900 -size 61844 +oid sha256:92a8c371df3f471fd6c117b4de98d7cb555b67e86a57207117afb85571c8987a +size 61870 diff --git a/thttpd.changes b/thttpd.changes index bebe0f4..724b733 100644 --- a/thttpd.changes +++ b/thttpd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jun 5 21:53:06 CEST 2007 - pcerny@suse.cz + +- added Short-Description tag into init script + ------------------------------------------------------------------- Fri Jun 1 19:34:10 CEST 2007 - pcerny@suse.cz diff --git a/thttpd.spec b/thttpd.spec index c4601a6..14afdbc 100644 --- a/thttpd.spec +++ b/thttpd.spec @@ -16,7 +16,7 @@ Provides: http_daemon PreReq: %fillup_prereq %insserv_prereq permissions Autoreqprov: on Version: 2.25b -Release: 84 +Release: 86 Source: %{name}-%{version}.tar.bz2 Source1: %{name}-SuSE.tar.bz2 Patch0: %{name}-%{version}-configure.patch @@ -68,7 +68,10 @@ Authors: %build # 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 +sed -i "s@__PREFIX__@%{_prefix}@g;\ + s@__SYSCONFDIR__@%{_sysconfdir}@g;\ + s@__NAME__@%{name}@g;\ + s@__VERSION__@%{version}@g" SuSE/etc/init.d/thttpd chmod 744 SuSE/etc/init.d/thttpd chmod 644 SuSE/etc/thttpd.conf %{suse_update_config} @@ -77,11 +80,11 @@ libtoolize --force aclocal --force autoconf -f V_CCOPT="$RPM_OPT_FLAGS -Wall" \ - ./configure \ - --mandir=%{_mandir} \ - --prefix=%{_prefix} \ - --infodir=%{_infodir} \ - --sysconfdir=%{_sysconfdir} +./configure \ + --mandir=%{_mandir} \ + --prefix=%{_prefix} \ + --infodir=%{_infodir} \ + --sysconfdir=%{_sysconfdir} %ifarch s390 s390x make F_PIE="-fPIE" %else @@ -90,15 +93,15 @@ make F_PIE="-fpie" %install install -d %{buildroot}/usr/bin \ - %{buildroot}/usr/sbin \ - %{buildroot}%{_mandir}/man1 \ - %{buildroot}%{_mandir}/man8 \ - %{buildroot}%{serverroot}/htdocs/users -make DESTDIR=%{buildroot}/ install + %{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}@" \ - %{buildroot}%{serverroot}/htdocs/index.html.template > \ - %{buildroot}%{serverroot}/htdocs/index.html + %{buildroot}%{serverroot}/htdocs/index.html.template > \ + %{buildroot}%{serverroot}/htdocs/index.html rm -f %{buildroot}%{serverroot}/htdocs/index.html.template %post @@ -133,6 +136,8 @@ rm -rf "%{buildroot}" %config /etc/thttpd.conf %changelog +* Tue Jun 05 2007 - pcerny@suse.cz +- added Short-Description tag into init script * Fri Jun 01 2007 - pcerny@suse.cz - added config file (/etc/thttpd.conf) * Fri Feb 16 2007 - mvaner@suse.cz