From 0ae3d34fc0a58cb249ba3177048128000356c68e Mon Sep 17 00:00:00 2001
From: Pavel Alexeev <hubbitus@fedoraproject.org>
Date: Mon, 9 Nov 2009 11:03:44 +0000
Subject: [PATCH 01/11] - Fix BZ#533144: - Add reload section to service file,
 fix stop. - Add %%{_sysconfdir}/NetworkManager/dispatcher.d/40-%%{name}
 (Thanks to     Pankaj Pandey) - Include man-files. - Add Requires:
 initscripts as owner directory    
 %%{_sysconfdir}/NetworkManager/dispatcher.d/

---
 .cvsignore  |  2 +-
 3proxy.init | 16 +++++++---------
 3proxy.spec | 30 ++++++++++++++++++++++++++----
 sources     |  2 +-
 4 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index e7857b0..b306019 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-3proxy-0.6.tgz
+3proxy.init
diff --git a/3proxy.init b/3proxy.init
index 47948da..556ee54 100644
--- a/3proxy.init
+++ b/3proxy.init
@@ -11,7 +11,6 @@
 #
 # processname: 3proxy
 # config: /etc/3proxy.cfg
-# pidfile: /var/run/3proxy.pid
 
 WITHOUT_RC_COMPAT=1
 
@@ -22,26 +21,25 @@ prog=3proxy
 CONFIG=/etc/3proxy.cfg
 PROXY=/usr/bin/3proxy
 RETVAL=0
-PIDFILE=/var/run/3proxy.pid
 LOCKFILE=/var/lock/subsys/3proxy
 #LOGFILE=/var/log/3proxy.log
 
 start() {
 	echo -n $"Starting $prog: "
 	# daemon --pidfile "${PIDFILE}" sh -c "exec \"$PROXY\" \"$CONFIG\" 2>&1 > \"$LOGFILE\" &"
-	daemon --pidfile "${PIDFILE}" "$PROXY" "$CONFIG"
+	daemon "$PROXY" "$CONFIG"
 	RETVAL=$?
 	echo
-		[ $RETVAL = 0 ] && touch ${LOCKFILE}
+		[ 0 -eq $RETVAL ] && touch ${LOCKFILE}
 	return $RETVAL
 }
 
 stop() {
 	echo -n $"Stopping $prog: "
-	killproc -p "${PIDFILE}" -d 1 "$PROXY"
+	killproc -d 3 "$prog"
 	RETVAL=$?
 	echo
-		[ $RETVAL = 0 ] && rm -f ${LOCKFILE} ${PIDFILE}
+		[ 0 -eq $RETVAL ] && rm -f ${LOCKFILE}
 	return $RETVAL
 }
 
@@ -52,7 +50,7 @@ restart() {
 
 reload(){
 	echo -n $"Reloading $prog: "
-	killproc -p ${pidfile} $httpd -USR1
+	killproc $prog -USR1
 	RETVAL=$?
 	echo
 }
@@ -75,11 +73,11 @@ case "$1" in
 	RETVAL=$?
 	;;
   status)
-	status -p "$PIDFILE" "$PROXY"
+	status "$PROXY"
 	RETVAL=$?
 	;;
   *)
-	echo $"Usage: $0 {start|stop|restart|condrestart|status}"
+	echo $"Usage: $0 {start|stop|restart|condrestart|status|reload}"
 	RETVAL=1
 	;;
 esac
diff --git a/3proxy.spec b/3proxy.spec
index a902b18..763ad40 100644
--- a/3proxy.spec
+++ b/3proxy.spec
@@ -1,6 +1,6 @@
 Name:		3proxy
 Version:		0.6
-Release:		3%{?dist}
+Release:		4%{?dist}
 
 Summary:		Tiny but very powerful proxy
 Summary(ru):	Маленький, но крайне мощный прокси-сервер
@@ -15,6 +15,7 @@ Source2:		3proxy.cfg
 # EPEL still require it
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	dos2unix
+Requires:		initscripts
 
 %description
 3proxy -- light proxy server.
@@ -46,9 +47,8 @@ dos2unix Changelog
 rm -rf %{buildroot}
 
 mkdir -p %{buildroot}%{_sysconfdir}
-mkdir -p %{buildroot}%{_sysconfdir}
-mkdir -p %{buildroot}%{_man3dir}
-mkdir -p %{buildroot}%{_man8dir}
+mkdir -p %{buildroot}%{_sysconfdir}/NetworkManager/dispatcher.d/
+mkdir -p %{buildroot}%{_mandir}/man8
 mkdir -p %{buildroot}%{_localstatedir}/log/%{name}
 install -m755 -D src/3proxy %{buildroot}%{_bindir}/3proxy
 install -m755 -D src/dighosts %{buildroot}%{_bindir}/dighosts
@@ -64,6 +64,19 @@ install -m755 -D src/udppm %{buildroot}%{_bindir}/udppm
 install -pD -m755 %{SOURCE1} %{buildroot}/%{_initrddir}/%{name}
 install -pD -m644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/%{name}.cfg
 
+	for man in man/*.8 ; do
+	gzip -9c "$man" > "%{buildroot}%{_mandir}/man8/$( basename $man ).gz"
+	touch --reference "$man" "%{buildroot}%{_mandir}/man8/$( basename $man ).gz"
+	done
+
+cat > %{buildroot}%{_sysconfdir}/NetworkManager/dispatcher.d/40-%{name} <<EOF
+#!/bin/sh
+
+	if [ "\$2" = "up" ]; then
+	/sbin/service 3proxy restart || : # reload doesn't work
+	fi
+EOF
+
 %clean
 rm -rf %{buildroot}
 
@@ -81,11 +94,20 @@ fi
 %defattr(-,root,root,-)
 %{_bindir}/*
 %config(noreplace) %{_sysconfdir}/%{name}.cfg
+%attr(0755,root,root) %config %{_sysconfdir}/NetworkManager/dispatcher.d/40-%{name}
 %{_initrddir}/%{name}
 %{_localstatedir}/log/%{name}
 %doc Readme Changelog authors copying news
+%{_mandir}/man8/*.8.gz
 
 %changelog
+* Sun Nov 8 2009 Pavel Alexeev <Pahan@Hubbitus.info> - 0.6-4
+- Fix BZ#533144:
+- Add reload section to service file, fix stop.
+- Add %%{_sysconfdir}/NetworkManager/dispatcher.d/40-%%{name} (Thanks to Pankaj Pandey)
+- Include man-files.
+- Add Requires: initscripts as owner directory %%{_sysconfdir}/NetworkManager/dispatcher.d/
+
 * Thu Aug 20 2009 Pavel Alexeev <Pahan@Hubbitus.info> - 0.6-3
 - Fedora Review started - thank you Peter Lemenkov.
 - Change rights (0755->0644) of config.
diff --git a/sources b/sources
index dd62cf4..a7f80ff 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2ebd9c06939021f6c2aca31d67782f71  3proxy-0.6.tgz
+5b15eaeb993ca0b048a5bc0f2b53465b  3proxy.init

From 99db3b8451b707d9f2c211d5871d019bb0484a65 Mon Sep 17 00:00:00 2001
From: Pavel Alexeev <hubbitus@fedoraproject.org>
Date: Mon, 9 Nov 2009 11:16:39 +0000
Subject: [PATCH 02/11] All souces, but not one by mistake.

---
 .cvsignore | 2 ++
 sources    | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/.cvsignore b/.cvsignore
index b306019..d0cd666 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,3 @@
 3proxy.init
+3proxy.cfg
+3proxy-0.6.tgz
diff --git a/sources b/sources
index a7f80ff..335c409 100644
--- a/sources
+++ b/sources
@@ -1 +1,3 @@
 5b15eaeb993ca0b048a5bc0f2b53465b  3proxy.init
+d9a0d2959ed2d5511ea59c563d34b692  3proxy.cfg
+2ebd9c06939021f6c2aca31d67782f71  3proxy-0.6.tgz

From 8407b3ad61ba1ed6d8a9ef44b73234194137b163 Mon Sep 17 00:00:00 2001
From: Pavel Alexeev <hubbitus@fedoraproject.org>
Date: Mon, 9 Nov 2009 12:10:27 +0000
Subject: [PATCH 03/11] - Fix BZ#533144: - Add reload section to service file,
 fix stop. - Add %%{_sysconfdir}/NetworkManager/dispatcher.d/40-%%{name}
 (Thanks to     Pankaj Pandey) - Include man-files. - Add Requires:
 initscripts as owner directory    
 %%{_sysconfdir}/NetworkManager/dispatcher.d/

---
 3proxy.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/3proxy.spec b/3proxy.spec
index 763ad40..5c41b07 100644
--- a/3proxy.spec
+++ b/3proxy.spec
@@ -1,6 +1,6 @@
 Name:		3proxy
 Version:		0.6
-Release:		4%{?dist}
+Release:		5%{?dist}
 
 Summary:		Tiny but very powerful proxy
 Summary(ru):	Маленький, но крайне мощный прокси-сервер
@@ -101,7 +101,7 @@ fi
 %{_mandir}/man8/*.8.gz
 
 %changelog
-* Sun Nov 8 2009 Pavel Alexeev <Pahan@Hubbitus.info> - 0.6-4
+* Sun Nov 8 2009 Pavel Alexeev <Pahan@Hubbitus.info> - 0.6-5
 - Fix BZ#533144:
 - Add reload section to service file, fix stop.
 - Add %%{_sysconfdir}/NetworkManager/dispatcher.d/40-%%{name} (Thanks to Pankaj Pandey)

From b163d3d2922f15c7ca08ecd1e14d38c4f81510ee Mon Sep 17 00:00:00 2001
From: Pavel Alexeev <hubbitus@fedoraproject.org>
Date: Tue, 24 Nov 2009 23:24:56 +0000
Subject: [PATCH 04/11] - Forgot commit new init-script for Fix BZ#533144.

---
 .cvsignore  |  4 ++--
 3proxy.init | 19 ++++++++++---------
 3proxy.spec |  5 ++++-
 sources     |  4 ++--
 4 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index d0cd666..6e2ffc7 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,3 @@
-3proxy.init
-3proxy.cfg
 3proxy-0.6.tgz
+3proxy.cfg
+3proxy.init
diff --git a/3proxy.init b/3proxy.init
index 556ee54..869dde5 100644
--- a/3proxy.init
+++ b/3proxy.init
@@ -4,13 +4,14 @@
 #
 # Written by Dag Wieers <dag@wieers.com>.
 # Rewrote for ALT Linux by Pavlov Konstantin <thresh@altlinux.ru>
-# Modifyed for Fedora by Pavel Alexeev aka Pahan-Hubbitus <Pahan@hubbitus.info>
+# Modified for Fedora by Pavel Alexeev aka Pahan-Hubbitus <Pahan@hubbitus.info>
 #
 # chkconfig: - 02 98
 # description: 3proxy Proxy Server
 #
 # processname: 3proxy
 # config: /etc/3proxy.cfg
+# pidfile: /var/run/3proxy.pid
 
 WITHOUT_RC_COMPAT=1
 
@@ -21,25 +22,25 @@ prog=3proxy
 CONFIG=/etc/3proxy.cfg
 PROXY=/usr/bin/3proxy
 RETVAL=0
+PIDFILE=/var/run/3proxy.pid
 LOCKFILE=/var/lock/subsys/3proxy
 #LOGFILE=/var/log/3proxy.log
 
 start() {
 	echo -n $"Starting $prog: "
-	# daemon --pidfile "${PIDFILE}" sh -c "exec \"$PROXY\" \"$CONFIG\" 2>&1 > \"$LOGFILE\" &"
-	daemon "$PROXY" "$CONFIG"
+	daemon --pidfile "${PIDFILE}" "$PROXY" "$CONFIG"
 	RETVAL=$?
 	echo
-		[ 0 -eq $RETVAL ] && touch ${LOCKFILE}
+		[ $RETVAL = 0 ] && touch ${LOCKFILE}
 	return $RETVAL
 }
 
 stop() {
 	echo -n $"Stopping $prog: "
-	killproc -d 3 "$prog"
+	killproc -p "${PIDFILE}" -d 1 "$PROXY"
 	RETVAL=$?
 	echo
-		[ 0 -eq $RETVAL ] && rm -f ${LOCKFILE}
+		[ $RETVAL = 0 ] && rm -f ${LOCKFILE} ${PIDFILE}
 	return $RETVAL
 }
 
@@ -50,7 +51,7 @@ restart() {
 
 reload(){
 	echo -n $"Reloading $prog: "
-	killproc $prog -USR1
+	killproc -p ${pidfile} $httpd -USR1
 	RETVAL=$?
 	echo
 }
@@ -73,11 +74,11 @@ case "$1" in
 	RETVAL=$?
 	;;
   status)
-	status "$PROXY"
+	status -p "$PIDFILE" "$PROXY"
 	RETVAL=$?
 	;;
   *)
-	echo $"Usage: $0 {start|stop|restart|condrestart|status|reload}"
+	echo $"Usage: $0 {start|stop|restart|condrestart|status}"
 	RETVAL=1
 	;;
 esac
diff --git a/3proxy.spec b/3proxy.spec
index 5c41b07..993c896 100644
--- a/3proxy.spec
+++ b/3proxy.spec
@@ -1,6 +1,6 @@
 Name:		3proxy
 Version:		0.6
-Release:		5%{?dist}
+Release:		6%{?dist}
 
 Summary:		Tiny but very powerful proxy
 Summary(ru):	Маленький, но крайне мощный прокси-сервер
@@ -101,6 +101,9 @@ fi
 %{_mandir}/man8/*.8.gz
 
 %changelog
+* Wed Nov 25 2009 Pavel Alexeev <Pahan@Hubbitus.info> - 0.6-6
+- Forgot commit new init-script for Fix BZ#533144.
+
 * Sun Nov 8 2009 Pavel Alexeev <Pahan@Hubbitus.info> - 0.6-5
 - Fix BZ#533144:
 - Add reload section to service file, fix stop.
diff --git a/sources b/sources
index 335c409..db96c92 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-5b15eaeb993ca0b048a5bc0f2b53465b  3proxy.init
-d9a0d2959ed2d5511ea59c563d34b692  3proxy.cfg
 2ebd9c06939021f6c2aca31d67782f71  3proxy-0.6.tgz
+d9a0d2959ed2d5511ea59c563d34b692  3proxy.cfg
+9aff12ce0d7dfc69ac7b4794a7747ae0  3proxy.init

From 14ac9890d282462e233e5fd7a5c4692df39d1181 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@fedoraproject.org>
Date: Wed, 25 Nov 2009 22:37:55 +0000
Subject: [PATCH 05/11] Fix typo that causes a failure to update the common
 directory. (releng     #2781)

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index d1e1256..543adab 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
 # Makefile for source rpm: 3proxy
-# $Id$
+# $Id: Makefile,v 1.1 2009/08/26 22:17:25 kevin Exp $
 NAME := 3proxy
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
 endef
 
 MAKEFILE_COMMON := $(shell $(find-makefile-common))

From 40f31a65f9b4540ec4353da4c0de8b03f69f4d64 Mon Sep 17 00:00:00 2001
From: Pavel Alexeev <hubbitus@fedoraproject.org>
Date: Sat, 28 Nov 2009 14:07:53 +0000
Subject: [PATCH 06/11] - Again new init-script for Fix BZ#533144 :).

---
 3proxy.init | 19 +++++++++----------
 3proxy.spec |  5 ++++-
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/3proxy.init b/3proxy.init
index 869dde5..556ee54 100644
--- a/3proxy.init
+++ b/3proxy.init
@@ -4,14 +4,13 @@
 #
 # Written by Dag Wieers <dag@wieers.com>.
 # Rewrote for ALT Linux by Pavlov Konstantin <thresh@altlinux.ru>
-# Modified for Fedora by Pavel Alexeev aka Pahan-Hubbitus <Pahan@hubbitus.info>
+# Modifyed for Fedora by Pavel Alexeev aka Pahan-Hubbitus <Pahan@hubbitus.info>
 #
 # chkconfig: - 02 98
 # description: 3proxy Proxy Server
 #
 # processname: 3proxy
 # config: /etc/3proxy.cfg
-# pidfile: /var/run/3proxy.pid
 
 WITHOUT_RC_COMPAT=1
 
@@ -22,25 +21,25 @@ prog=3proxy
 CONFIG=/etc/3proxy.cfg
 PROXY=/usr/bin/3proxy
 RETVAL=0
-PIDFILE=/var/run/3proxy.pid
 LOCKFILE=/var/lock/subsys/3proxy
 #LOGFILE=/var/log/3proxy.log
 
 start() {
 	echo -n $"Starting $prog: "
-	daemon --pidfile "${PIDFILE}" "$PROXY" "$CONFIG"
+	# daemon --pidfile "${PIDFILE}" sh -c "exec \"$PROXY\" \"$CONFIG\" 2>&1 > \"$LOGFILE\" &"
+	daemon "$PROXY" "$CONFIG"
 	RETVAL=$?
 	echo
-		[ $RETVAL = 0 ] && touch ${LOCKFILE}
+		[ 0 -eq $RETVAL ] && touch ${LOCKFILE}
 	return $RETVAL
 }
 
 stop() {
 	echo -n $"Stopping $prog: "
-	killproc -p "${PIDFILE}" -d 1 "$PROXY"
+	killproc -d 3 "$prog"
 	RETVAL=$?
 	echo
-		[ $RETVAL = 0 ] && rm -f ${LOCKFILE} ${PIDFILE}
+		[ 0 -eq $RETVAL ] && rm -f ${LOCKFILE}
 	return $RETVAL
 }
 
@@ -51,7 +50,7 @@ restart() {
 
 reload(){
 	echo -n $"Reloading $prog: "
-	killproc -p ${pidfile} $httpd -USR1
+	killproc $prog -USR1
 	RETVAL=$?
 	echo
 }
@@ -74,11 +73,11 @@ case "$1" in
 	RETVAL=$?
 	;;
   status)
-	status -p "$PIDFILE" "$PROXY"
+	status "$PROXY"
 	RETVAL=$?
 	;;
   *)
-	echo $"Usage: $0 {start|stop|restart|condrestart|status}"
+	echo $"Usage: $0 {start|stop|restart|condrestart|status|reload}"
 	RETVAL=1
 	;;
 esac
diff --git a/3proxy.spec b/3proxy.spec
index 993c896..6fee4ad 100644
--- a/3proxy.spec
+++ b/3proxy.spec
@@ -1,6 +1,6 @@
 Name:		3proxy
 Version:		0.6
-Release:		6%{?dist}
+Release:		7%{?dist}
 
 Summary:		Tiny but very powerful proxy
 Summary(ru):	Маленький, но крайне мощный прокси-сервер
@@ -101,6 +101,9 @@ fi
 %{_mandir}/man8/*.8.gz
 
 %changelog
+* Wed Nov 25 2009 Pavel Alexeev <Pahan@Hubbitus.info> - 0.6-7
+- Again new init-script for Fix BZ#533144 :).
+
 * Wed Nov 25 2009 Pavel Alexeev <Pahan@Hubbitus.info> - 0.6-6
 - Forgot commit new init-script for Fix BZ#533144.
 

From c7b25b8d05ec8202a2dc60803d81b0bd185b1c4f Mon Sep 17 00:00:00 2001
From: Pavel Alexeev <hubbitus@fedoraproject.org>
Date: Mon, 15 Mar 2010 11:38:55 +0000
Subject: [PATCH 07/11] - Update to version 0.6.1 - In NM event processing
 replace service restart to condrestart - BZ#572662

---
 .cvsignore  |  2 +-
 3proxy.spec | 10 +++++++---
 sources     |  4 ++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 6e2ffc7..fa2cc0c 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,3 @@
-3proxy-0.6.tgz
 3proxy.cfg
 3proxy.init
+3proxy-0.6.1.tgz
diff --git a/3proxy.spec b/3proxy.spec
index 6fee4ad..d7fd40d 100644
--- a/3proxy.spec
+++ b/3proxy.spec
@@ -1,6 +1,6 @@
 Name:		3proxy
-Version:		0.6
-Release:		7%{?dist}
+Version:		0.6.1
+Release:		8%{?dist}
 
 Summary:		Tiny but very powerful proxy
 Summary(ru):	Маленький, но крайне мощный прокси-сервер
@@ -73,7 +73,7 @@ cat > %{buildroot}%{_sysconfdir}/NetworkManager/dispatcher.d/40-%{name} <<EOF
 #!/bin/sh
 
 	if [ "\$2" = "up" ]; then
-	/sbin/service 3proxy restart || : # reload doesn't work
+	/sbin/service 3proxy condrestart || : # reload doesn't work
 	fi
 EOF
 
@@ -101,6 +101,10 @@ fi
 %{_mandir}/man8/*.8.gz
 
 %changelog
+* Mon Mar 15 2010 Pavel Alexeev <Pahan@Hubbitus.info> - 0.6.1-8
+- Update to version 0.6.1
+- In NM event processing replace service restart to condrestart - BZ#572662
+
 * Wed Nov 25 2009 Pavel Alexeev <Pahan@Hubbitus.info> - 0.6-7
 - Again new init-script for Fix BZ#533144 :).
 
diff --git a/sources b/sources
index db96c92..b2477f8 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-2ebd9c06939021f6c2aca31d67782f71  3proxy-0.6.tgz
 d9a0d2959ed2d5511ea59c563d34b692  3proxy.cfg
-9aff12ce0d7dfc69ac7b4794a7747ae0  3proxy.init
+5b15eaeb993ca0b048a5bc0f2b53465b  3proxy.init
+03790467a12e16ed8785ae688ecf9b68  3proxy-0.6.1.tgz

From 4460b1f8d0121c3c27be9d1c1cec418f7ae24e49 Mon Sep 17 00:00:00 2001
From: Pavel Alexeev <hubbitus@fedoraproject.org>
Date: Sun, 30 May 2010 17:58:04 +0000
Subject: [PATCH 08/11] Correct path to config file in man (BUG#596087) add
 Patch0:     3proxy-0.6.1-config-path.patch

---
 .cvsignore | 4 +---
 sources    | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index fa2cc0c..ef3c88b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1 @@
-3proxy.cfg
-3proxy.init
-3proxy-0.6.1.tgz
+3proxy-0.6.1-config-path.patch
diff --git a/sources b/sources
index b2477f8..887f550 100644
--- a/sources
+++ b/sources
@@ -1,3 +1 @@
-d9a0d2959ed2d5511ea59c563d34b692  3proxy.cfg
-5b15eaeb993ca0b048a5bc0f2b53465b  3proxy.init
-03790467a12e16ed8785ae688ecf9b68  3proxy-0.6.1.tgz
+b20790ea04b8cd8b366df9323416f604  3proxy-0.6.1-config-path.patch

From cd8f98ab6c305205bdbbe4c4a9950c85071b2d4d Mon Sep 17 00:00:00 2001
From: Pavel Alexeev <hubbitus@fedoraproject.org>
Date: Sun, 30 May 2010 18:18:12 +0000
Subject: [PATCH 09/11] Correct path to config file in man (BUG#596087) add
 Patch0:     3proxy-0.6.1-config-path.patch

---
 .cvsignore  |  3 +++
 3proxy.spec | 10 +++++++++-
 sources     |  3 +++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/.cvsignore b/.cvsignore
index ef3c88b..08ff98a 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,4 @@
+3proxy.init
+3proxy.cfg
+3proxy-0.6.1.tgz
 3proxy-0.6.1-config-path.patch
diff --git a/3proxy.spec b/3proxy.spec
index d7fd40d..971b34c 100644
--- a/3proxy.spec
+++ b/3proxy.spec
@@ -1,6 +1,6 @@
 Name:		3proxy
 Version:		0.6.1
-Release:		8%{?dist}
+Release:		9%{?dist}
 
 Summary:		Tiny but very powerful proxy
 Summary(ru):	Маленький, но крайне мощный прокси-сервер
@@ -17,6 +17,9 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	dos2unix
 Requires:		initscripts
 
+# I correct config path in man only. It is fully Fedora related.
+Patch0:		3proxy-0.6.1-config-path.patch
+
 %description
 3proxy -- light proxy server.
 Universal proxy server with HTTP, HTTPS, SOCKS v4, SOCKS v4a, SOCKS v5, FTP,
@@ -35,6 +38,8 @@ SOCKS v5, FTP, POP3, UDP и TCP проброс портов (portmapping), сп
 %prep
 %setup -q
 
+%patch0 -p0 -b .man-cfg
+
 # To use "fedora" CFLAGS (exported)
 sed -i -e "s/CFLAGS =/CFLAGS +=/" Makefile.Linux
 
@@ -101,6 +106,9 @@ fi
 %{_mandir}/man8/*.8.gz
 
 %changelog
+* Sun May 30 2010 Pavel Alexeev <Pahan@Hubbitus.info> - 0.6.1-9
+- Correct path to config file in man (BUG#596087) add Patch0: 3proxy-0.6.1-config-path.patch
+
 * Mon Mar 15 2010 Pavel Alexeev <Pahan@Hubbitus.info> - 0.6.1-8
 - Update to version 0.6.1
 - In NM event processing replace service restart to condrestart - BZ#572662
diff --git a/sources b/sources
index 887f550..5cf5eeb 100644
--- a/sources
+++ b/sources
@@ -1 +1,4 @@
+5b15eaeb993ca0b048a5bc0f2b53465b  3proxy.init
+d9a0d2959ed2d5511ea59c563d34b692  3proxy.cfg
+03790467a12e16ed8785ae688ecf9b68  3proxy-0.6.1.tgz
 b20790ea04b8cd8b366df9323416f604  3proxy-0.6.1-config-path.patch

From 5970885433b1ab7ffc77e5cf906042670e8112d1 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
Date: Wed, 28 Jul 2010 08:45:04 +0000
Subject: [PATCH 10/11] dist-git conversion

---
 .cvsignore => .gitignore |  0
 Makefile                 | 21 ---------------------
 import.log               |  1 -
 3 files changed, 22 deletions(-)
 rename .cvsignore => .gitignore (100%)
 delete mode 100644 Makefile
 delete mode 100644 import.log

diff --git a/.cvsignore b/.gitignore
similarity index 100%
rename from .cvsignore
rename to .gitignore
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 543adab..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: 3proxy
-# $Id: Makefile,v 1.1 2009/08/26 22:17:25 kevin Exp $
-NAME := 3proxy
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
diff --git a/import.log b/import.log
deleted file mode 100644
index 6fff697..0000000
--- a/import.log
+++ /dev/null
@@ -1 +0,0 @@
-proxy-0_6-3_fc11:HEAD:3proxy-0.6-3.fc11.src.rpm:1251404030

From c5cc3de94b466824f302497981a84ec15b9db8af Mon Sep 17 00:00:00 2001
From: "Pavel Alexeev (aka Pahan-Hubbitus)" <pahan@hubbitus.info>
Date: Thu, 4 Nov 2010 18:07:18 +0300
Subject: [PATCH 11/11] - Add man3/3proxy.cfg.3 man (BZ#648204). - Gone
 explicit man gzip - leave it for rpm.

---
 3proxy.cfg  |  2 +-
 3proxy.spec | 14 +++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/3proxy.cfg b/3proxy.cfg
index 8212546..1c038ac 100644
--- a/3proxy.cfg
+++ b/3proxy.cfg
@@ -175,4 +175,4 @@ admin
 # now we needn't any root rights. We can chroot and setgid/setuid.
 
 
-###$Id: 3proxy.cfg,v 1.1 2009/08/27 20:14:25 hubbitus Exp $#######
+###$Id: 3proxy.cfg.sample,v 1.5 2004/07/16 12:37:20 vlad Exp $#######
diff --git a/3proxy.spec b/3proxy.spec
index 971b34c..5849319 100644
--- a/3proxy.spec
+++ b/3proxy.spec
@@ -1,6 +1,6 @@
 Name:		3proxy
 Version:		0.6.1
-Release:		9%{?dist}
+Release:		10%{?dist}
 
 Summary:		Tiny but very powerful proxy
 Summary(ru):	Маленький, но крайне мощный прокси-сервер
@@ -53,7 +53,7 @@ rm -rf %{buildroot}
 
 mkdir -p %{buildroot}%{_sysconfdir}
 mkdir -p %{buildroot}%{_sysconfdir}/NetworkManager/dispatcher.d/
-mkdir -p %{buildroot}%{_mandir}/man8
+mkdir -p %{buildroot}%{_mandir}/man{3,8}
 mkdir -p %{buildroot}%{_localstatedir}/log/%{name}
 install -m755 -D src/3proxy %{buildroot}%{_bindir}/3proxy
 install -m755 -D src/dighosts %{buildroot}%{_bindir}/dighosts
@@ -69,9 +69,8 @@ install -m755 -D src/udppm %{buildroot}%{_bindir}/udppm
 install -pD -m755 %{SOURCE1} %{buildroot}/%{_initrddir}/%{name}
 install -pD -m644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/%{name}.cfg
 
-	for man in man/*.8 ; do
-	gzip -9c "$man" > "%{buildroot}%{_mandir}/man8/$( basename $man ).gz"
-	touch --reference "$man" "%{buildroot}%{_mandir}/man8/$( basename $man ).gz"
+	for man in man/*.{3,8} ; do
+	install "$man" "%{buildroot}%{_mandir}/man${man:(-1)}/"
 	done
 
 cat > %{buildroot}%{_sysconfdir}/NetworkManager/dispatcher.d/40-%{name} <<EOF
@@ -104,8 +103,13 @@ fi
 %{_localstatedir}/log/%{name}
 %doc Readme Changelog authors copying news
 %{_mandir}/man8/*.8.gz
+%{_mandir}/man3/*.3.gz
 
 %changelog
+* Thu Nov 4 2010 Pavel Alexeev <Pahan@Hubbitus.info> - 0.6.1-10
+- Add man3/3proxy.cfg.3 man (BZ#648204).
+- Gone explicit man gzip - leave it for rpm.
+
 * Sun May 30 2010 Pavel Alexeev <Pahan@Hubbitus.info> - 0.6.1-9
 - Correct path to config file in man (BUG#596087) add Patch0: 3proxy-0.6.1-config-path.patch