From 9274b5556ee3c546176936580c9bb5403b2c09e6 Mon Sep 17 00:00:00 2001 From: Mukund Sivaraman Date: Sat, 14 Nov 2009 16:40:46 +0530 Subject: Remove packaging related items --- Makefile.am | 1 - configure.ac | 3 -- packaging/Makefile.am | 5 -- packaging/fedora/.gitignore | 1 - packaging/fedora/Makefile.am | 9 ---- packaging/fedora/tinyproxy.init | 106 ------------------------------------- packaging/fedora/tinyproxy.spec.in | 95 --------------------------------- 7 files changed, 220 deletions(-) delete mode 100644 packaging/Makefile.am delete mode 100644 packaging/fedora/.gitignore delete mode 100644 packaging/fedora/Makefile.am delete mode 100644 packaging/fedora/tinyproxy.init delete mode 100644 packaging/fedora/tinyproxy.spec.in diff --git a/Makefile.am b/Makefile.am index f3747b8..7de41f2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,7 +4,6 @@ SUBDIRS = \ etc \ docs \ m4macros \ - packaging \ tests # tools want this on a single line diff --git a/configure.ac b/configure.ac index 6fd041e..72bae5b 100644 --- a/configure.ac +++ b/configure.ac @@ -295,9 +295,6 @@ docs/man5/tinyproxy.conf.txt docs/man8/Makefile docs/man8/tinyproxy.txt m4macros/Makefile -packaging/Makefile -packaging/fedora/tinyproxy.spec -packaging/fedora/Makefile tests/Makefile tests/scripts/Makefile ]) diff --git a/packaging/Makefile.am b/packaging/Makefile.am deleted file mode 100644 index 6fc8a1c..0000000 --- a/packaging/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ - -# The various packaging directories - -SUBDIRS = fedora - diff --git a/packaging/fedora/.gitignore b/packaging/fedora/.gitignore deleted file mode 100644 index b8b2953..0000000 --- a/packaging/fedora/.gitignore +++ /dev/null @@ -1 +0,0 @@ -tinyproxy.spec diff --git a/packaging/fedora/Makefile.am b/packaging/fedora/Makefile.am deleted file mode 100644 index f3b4a7b..0000000 --- a/packaging/fedora/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ - -# Packaging files - -PACKAGING_FILES = \ - tinyproxy.init \ - tinyproxy.spec - -EXTRA_DIST = $(PACKAGING_FILES) - diff --git a/packaging/fedora/tinyproxy.init b/packaging/fedora/tinyproxy.init deleted file mode 100644 index 9209674..0000000 --- a/packaging/fedora/tinyproxy.init +++ /dev/null @@ -1,106 +0,0 @@ -#!/bin/sh -# -# tinyproxy Startup script for the tinyproxy server -# -# chkconfig: - 85 15 -# description: small, efficient HTTP/SSL proxy daemon -# -# processname: tinyproxy -# config: /etc/tinyproxy/tinyproxy.conf -# config: /etc/sysconfig/tinyproxy -# pidfile: /var/run/tinyproxy.pid -# -# Note: pidfile is created by tinyproxy in its config -# see PidFile in the configuration file. - -# Source function library. -. /etc/rc.d/init.d/functions - -# Source networking configuration. -. /etc/sysconfig/network - -# Check that networking is up. -[ "$NETWORKING" = "no" ] && exit 0 - -exec="/usr/sbin/tinyproxy" -prog=$(basename $exec) -config="/etc/tinyproxy/tinyproxy.conf" - -[ -e /etc/sysconfig/tinyproxy ] && . /etc/sysconfig/tinyproxy - -lockfile=/var/lock/subsys/tinyproxy - -start() { - [ -x $exec ] || exit 5 - [ -f $config ] || exit 6 - echo -n $"Starting $prog: " - daemon $exec -c $config - retval=$? - echo - [ $retval -eq 0 ] && touch $lockfile - return $retval -} - -stop() { - echo -n $"Stopping $prog: " - # stop it here, often "killproc $prog" - killproc $prog - retval=$? - echo - [ $retval -eq 0 ] && rm -f $lockfile - return $retval -} - -restart() { - stop - start -} - -reload() { - restart -} - -force_reload() { - restart -} - -rh_status() { - status $prog -} - -rh_status_q() { - rh_status >/dev/null 2>&1 -} - -case "$1" in - start) - rh_status_q && exit 0 - $1 - ;; - stop) - rh_status_q || exit 0 - $1 - ;; - restart) - $1 - ;; - reload) - rh_status_q || exit 7 - $1 - ;; - force-reload) - force_reload - ;; - status) - rh_status - ;; - condrestart|try-restart) - rh_status_q || exit 0 - restart - ;; - *) - echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" - exit 2 -esac -exit $? - diff --git a/packaging/fedora/tinyproxy.spec.in b/packaging/fedora/tinyproxy.spec.in deleted file mode 100644 index a7ea106..0000000 --- a/packaging/fedora/tinyproxy.spec.in +++ /dev/null @@ -1,95 +0,0 @@ -%define tinyproxy_confdir %{_sysconfdir}/tinyproxy -%define tinyproxy_datadir %{_datadir}/tinyproxy - -Name: tinyproxy -Version: @VERSION@ -Release: 2%{?dist} -Summary: A light-weight HTTP proxy daemon - -Group: System Environment/Daemons -License: GPLv2+ -URL: https://www.banu.com/tinyproxy/ -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: https://www.banu.com/pub/tinyproxy/1.7/%{name}-%{version}.tar.gz -Source1: %{name}.init -Source2: %{name}.conf - -Requires(post): chkconfig -Requires(preun): chkconfig -Requires(preun): initscripts - -%description -Tinyproxy is a light-weight HTTP proxy daemon designed to consume a -minimum amount of system resources. It listens on a given TCP port and -handles HTTP proxy requests. Designed from the ground up to be fast and -yet small, it is an ideal solution for use cases such as embedded -deployments where a full featured HTTP proxy is required, but the system -resources for a larger proxy are unavailable. - - -%prep -%setup -q - - -%build -%configure --with-config=%{tinyproxy_confdir}/%{name}.conf -make %{?_smp_mflags} - - -%install -rm -rf %{buildroot} -make install-exec DESTDIR=%{buildroot} - -# The default 'make install' installs too many items, so we trim it down -# and install manually -%{__install} -p -D -m 0755 %{SOURCE1} %{buildroot}%{_initrddir}/%{name} -%{__install} -p -D -m 0644 %{SOURCE2} %{buildroot}%{tinyproxy_confdir}/%{name}.conf -%{__install} -d -m 0755 %{buildroot}%{tinyproxy_datadir} -%{__install} -p -D -m 0644 ./doc/%{name}.8 %{buildroot}%{_mandir}/man8/%{name}.8 - -for htmlfile in $(find ./doc/ -type f -name '*.html') -do - %{__install} -p -m 0644 $htmlfile %{buildroot}%{tinyproxy_datadir} -done - -%clean -rm -rf %{buildroot} - - -%post -/sbin/chkconfig --add %{name} - - -%preun -if [ $1 = 0 ]; then - /sbin/service %{name} stop >/dev/null 2>&1 - /sbin/chkconfig --del %{name} -fi - - -%postun -if [ "$1" -ge "1" ]; then - /sbin/service %{name} condrestart > /dev/null 2>&1 || : -fi - - - -%files -%defattr(-,root,root,-) -%doc AUTHORS COPYING README doc/*.txt -%{_sbindir}/%{name} -%{_mandir}/man8/%{name}.8.gz -%{_initrddir}/%{name} -%dir %{tinyproxy_datadir} -%dir %{tinyproxy_datadir}/* -%dir %{tinyproxy_confdir} -%config(noreplace) %{tinyproxy_confdir}/%{name}.conf - -%changelog -* Wed Apr 16 2008 Jeremy Hinegardner - 1.6.3-2 -- fix spec review issues -- fix initscript - -* Sun Mar 09 2008 Jeremy Hinegardner - 1.6.3-1 -- Initial rpm configuration -- cgit v1.2.3