[iodine] By request bz#758930 split to subpackages.
Pavel Alexeev
hubbitus at fedoraproject.org
Mon Jan 2 19:36:09 UTC 2012
commit 58322bebc97bedb57d62f0da3f56de52b591a505
Author: Pavel Alexeev (aka Pahan-Hubbitus) <pahan at hubbitus.info>
Date: Mon Jan 2 23:35:46 2012 +0400
By request bz#758930 split to subpackages.
.gitignore | 7 +++++
iodine.logrotate | 8 -----
iodine.spec | 77 ++++++++++++++++++++++++++++++++++++++++++++---------
sources | 7 +++++
4 files changed, 78 insertions(+), 21 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index dcd6e1e..99bae01 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,8 @@
/iodine-0.6.0-rc1.tar.gz
+/iodine.logrotate.client
+/iodine.logrotate.server
+/iodine-server.init
+/iodine-server.conf
+/iodine-client.init
+/iodine-client.conf
+/iodine-0.5.2-prefix.patch
diff --git a/iodine.spec b/iodine.spec
index 7c495ba..6e7e06a 100644
--- a/iodine.spec
+++ b/iodine.spec
@@ -2,7 +2,7 @@
Name: iodine
Version: 0.6.0
-Release: 0.rc1.6%{?dist}.1
+Release: 0.rc1.7%{?dist}
Summary: Solution to tunnel IPv4 data through a DNS server
Summary(ru): Решение для туннелирования IPv4 трафика через DNS сервер
Group: System Environment/Daemons
@@ -16,9 +16,10 @@ Source2: %{name}-server.conf
Source3: %{name}-client.init
Source4: %{name}-server.init
-Source5: %{name}.logrotate
+Source5: %{name}.logrotate.client
+Source6: %{name}.logrotate.server
-# It is needed because I plan push it in EPEL too
+# It still needed for EPEL5
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# http://dev.kryo.se/iodine/ticket/87
Patch0: iodine-0.5.2-prefix.patch
@@ -28,6 +29,9 @@ Requires(post): chkconfig
Requires(preun): chkconfig, initscripts
Requires(postun): initscripts
+Requires: %{name}-client
+Requires: %{name}-server
+
%description
iodine lets you tunnel IPv4 data through a DNS server. This can be usable in
different situations where internet access is firewalled, but DNS queries are
@@ -37,6 +41,8 @@ It runs on Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD and Windows and needs a
TUN/TAP device. The bandwidth is asymmetrical with limited upstream and up to
1 Mbit/s downstream.
+This is meta-package to install both client and server.
+
%description -l ru
iodine предоставляет возможность пробросить IPv4 туннель сквозь DNS сервер.
Это может быть очень полезно в разных ситуациях, когда доступ в интернет
@@ -46,6 +52,34 @@ Iodine работает на Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD и Window
использует TUN/TAP устройство. Пропускная способность асимметрична - аплоад не
быстр, скачивание до 1 Mbit/s.
+Это мета-пакет для инсталляции обоих пакетов, клиента и сервера.
+
+%package client
+Summary: Client part of solution to tunnel IPv4 data through a DNS server
+Summary(ru): Клиент для туннелирования IPv4 трафика через DNS сервер
+Requires(post): chkconfig
+Requires(preun): chkconfig, initscripts
+Requires(postun): initscripts
+
+%description client
+This is the client part of iodine sulution.
+
+%description client -l ru
+Это пакет клиентской части
+
+%package server
+Summary: Server part of solution to tunnel IPv4 data through a DNS server
+Summary(ru): Сервер для туннелирования IPv4 трафика через DNS сервер
+Requires(post): chkconfig
+Requires(preun): chkconfig, initscripts
+Requires(postun): initscripts
+
+%description server
+This is the server part of iodine solution.
+
+%description server -l ru
+Это пакет серверной части
+
%prep
%setup -q -n %{name}-%{version}%{prerel}
%patch0 -p0 -b .prefix
@@ -64,47 +98,64 @@ install -Dp -m 0644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/sysconfig/%{name}-ser
install -Dp -m 0755 %{SOURCE3} %{buildroot}/%{_initrddir}/%{name}-client
install -Dp -m 0755 %{SOURCE4} %{buildroot}/%{_initrddir}/%{name}-server
-install -Dp -m 0644 %{SOURCE5} %{buildroot}/%{_sysconfdir}/logrotate.d/%{name}
+install -Dp -m 0644 %{SOURCE5} %{buildroot}/%{_sysconfdir}/logrotate.d/%{name}-client
+install -Dp -m 0644 %{SOURCE6} %{buildroot}/%{_sysconfdir}/logrotate.d/%{name}-server
%clean
rm -rf %{buildroot}
-%post
+%post client
/sbin/chkconfig --add %{name}-client
+
+%post server
/sbin/chkconfig --add %{name}-server
-%preun
+%preun client
if [ $1 = 0 ] ; then
/sbin/service %{name}-client stop >/dev/null 2>&1
/sbin/chkconfig --del %{name}-client
+fi
+%preun server
+if [ $1 = 0 ] ; then
/sbin/service %{name}-server stop >/dev/null 2>&1
/sbin/chkconfig --del %{name}-server
fi
-%postun
+%postun client
if [ "$1" -ge "1" ] ; then
/sbin/service %{name}-client condrestart >/dev/null 2>&1 || :
+fi
+
+%postun server
+if [ "$1" -ge "1" ] ; then
/sbin/service %{name}-server condrestart >/dev/null 2>&1 || :
fi
%files
%defattr(-,root,root,-)
%doc CHANGELOG README TODO
+
+%files client
+%defattr(-,root,root,-)
%{_sbindir}/%{name}
-%{_sbindir}/%{name}d
+%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/sysconfig/%{name}-client
+%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}-client
+%{_initrddir}/%{name}-client
%{_mandir}/man8/%{name}.8.gz
-%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/sysconfig/%{name}-client
+%files server
+%defattr(-,root,root,-)
+%{_sbindir}/%{name}d
%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/sysconfig/%{name}-server
-
-%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
-
-%{_initrddir}/%{name}-client
+%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}-server
%{_initrddir}/%{name}-server
%changelog
+* Mon Jan 2 2012 Pavel Alexeev <Pahan at Hubbitus.info> - 0.6.0-0.rc1.7
+- By request bz#758930 split to subpackages.
+
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.0-0.rc1.6.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/sources b/sources
index fb25229..6ea06c8 100644
--- a/sources
+++ b/sources
@@ -1 +1,8 @@
+37ffd972c64a8401836826c7b6f93bbf iodine.logrotate.server
+5b0091019b1041446f239e4c9648beaa iodine.logrotate.client
+4b5fee2882c3f289d7c5131e213dd584 iodine-server.init
+b3fef4514a892ffaaa9b031756786b3b iodine-server.conf
+aa061203c7b4e86f6849390e90da191f iodine-client.init
+3503689c59abaff2973a5190eec37013 iodine-client.conf
a15bb4faba020d217016fde6e231074a iodine-0.6.0-rc1.tar.gz
+ea7ea39768804638eda426e03ec5b050 iodine-0.5.2-prefix.patch
More information about the scm-commits
mailing list