rpms/miredo/F-10 .cvsignore, 1.2, 1.3 miredo.spec, 1.1, 1.2 sources, 1.2, 1.3
jens
jens at fedoraproject.org
Sat Jul 25 13:44:59 UTC 2009
Author: jens
Update of /cvs/pkgs/rpms/miredo/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21828
Modified Files:
.cvsignore miredo.spec sources
Log Message:
Update to 1.1.7
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/miredo/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore 1 Jul 2009 07:31:39 -0000 1.2
+++ .cvsignore 25 Jul 2009 13:44:59 -0000 1.3
@@ -1 +1 @@
-miredo-1.1.6.tar.bz2
+miredo-1.1.7.tar.bz2
Index: miredo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/miredo/F-10/miredo.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- miredo.spec 1 Jul 2009 07:31:39 -0000 1.1
+++ miredo.spec 25 Jul 2009 13:44:59 -0000 1.2
@@ -1,6 +1,6 @@
# vim: expandtab
Name: miredo
-Version: 1.1.6
+Version: 1.1.7
Release: 2%{?dist}
Summary: Tunneling of IPv6 over UDP through NATs
@@ -10,9 +10,6 @@ URL: http://www.simphalempin.
Source0: http://www.remlab.net/files/miredo/miredo-%{version}.tar.bz2
Source1: miredo-client.init
Source2: miredo-server.init
-%if 0%{?rhel}
-Source3: isatapd.init
-%endif
Patch0: miredo-config-not-exec
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -23,26 +20,61 @@ Requires(post): chkconfig, /sbin/ldcon
Requires(preun): chkconfig, initscripts
Requires(postun): initscripts, /sbin/ldconfig
-
%description
Miredo is an implementation of the "Teredo: Tunneling IPv6 over UDP
through NATs" proposed Internet standard (RFC4380). It can serve
either as a Teredo client, a stand-alone Teredo relay, or a Teredo
-server. It is meant to provide IPv6 connectivity to hosts behind NAT
+server, please install the miredo-server or miredo-client aproprietly.
+It is meant to provide IPv6 connectivity to hosts behind NAT
devices, most of which do not support IPv6, and not even
IPv6-over-IPv4 (including 6to4).
+%package libs
+Summary: Tunneling of IPv6 over UDP through NATs
+Group: Applications/Internet
+
+%description libs
+Miredo is an implementation of the "Teredo: Tunneling IPv6 over UDP
+through NATs" proposed Internet standard (RFC4380). It can serve
+either as a Teredo client, a stand-alone Teredo relay, or a Teredo
+server, please install the miredo-server or miredo-client aproprietly.
+It is meant to provide IPv6 connectivity to hosts behind NAT
+devices, most of which do not support IPv6, and not even
+IPv6-over-IPv4 (including 6to4).
+This libs package provides the files necessary for both server and client.
+
%package devel
Summary: Header files, libraries and development documentation for %{name}
Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
%description devel
This package contains the header files, development libraries and development
documentation for %{name}. If you would like to develop programs using %{name},
you will need to install %{name}-devel.
+%package server
+Summary: Tunneling server for IPv6 over UDP through NATs
+Group: Applications/Internet
+Requires: %{name}-libs = %{version}-%{release}
+%description server
+Miredo is an implementation of the "Teredo: Tunneling IPv6 over UDP
+through NATs" proposed Internet standard (RFC4380). This offers the server
+part of miredo. Most people will need only the client part.
+
+%package client
+Summary: Tunneling client for IPv6 over UDP through NATs
+Group: Applications/Internet
+Requires: %{name}-libs = %{version}-%{release}
+Provides: %{name} = %{version}-%{release}
+Obsoletes: %{name} = 1.1.6-2
+
+
+%description client
+Miredo is an implementation of the "Teredo: Tunneling IPv6 over UDP
+through NATs" proposed Internet standard (RFC4380). This offers the client
+part of miredo. Most people only need the client part.
%prep
%setup -q
@@ -52,8 +84,9 @@ you will need to install %{name}-devel.
%configure \
--disable-static \
--disable-rpath \
- --with-Judy \
- --enable-miredo-user
+ --enable-miredo-user \
+ --without-Judy
+
# rpath does not really work
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
@@ -69,84 +102,64 @@ mv %{buildroot}%{_docdir}/miredo/example
mkdir -p %{buildroot}%{_initrddir}
install -p -m 755 %{SOURCE1} %{buildroot}%{_initrddir}/miredo-client
install -p -m 755 %{SOURCE2} %{buildroot}%{_initrddir}/miredo-server
-%if 0%{?rhel}
-install -p -m 755 %{SOURCE3} %{buildroot}%{_initrddir}/isatapd
-%endif
rm -f %{buildroot}%{_libdir}/lib*.la
touch %{buildroot}%{_sysconfdir}/miredo/miredo-server.conf
-%pre
+%pre libs
getent group miredo >/dev/null || groupadd -r miredo
-getent passwd miredo >/dev/null || useradd -r -g miredo -d /etc/miredo -s /sbin/nologin \
- -c "Miredo Daemon" miredo
+getent passwd miredo >/dev/null || useradd -r -g miredo -d /etc/miredo \
+ -s /sbin/nologin -c "Miredo Daemon" miredo
exit 0
-%post
-/sbin/ldconfig
+%post libs -p /sbin/ldconfig
+
+%post client
/sbin/chkconfig --add miredo-client
+
+%post server
/sbin/chkconfig --add miredo-server
-%if 0%{?rhel}
-/sbin/chkconfig --add isatapd
-%endif
-%preun
+%preun client
if [ $1 = 0 ] ; then
- %if 0%{?rhel}
- /sbin/service isatapd stop >/dev/null 2>&1
- %endif
- /sbin/service miredo-server stop >/dev/null 2>&1
/sbin/service miredo-client stop >/dev/null 2>&1
/sbin/chkconfig --del miredo-client
+fi
+
+%preun server
+if [ $1 = 0 ] ; then
+ /sbin/service miredo-server stop >/dev/null 2>&1
/sbin/chkconfig --del miredo-server
- %if 0%{?rhel}
- /sbin/chkconfig --del isatapd
- %endif
fi
-%postun
-/sbin/ldconfig
+%postun libs -p /sbin/ldconfig
+
+%postun client
if [ "$1" -ge "1" ] ; then
- %if 0%{?rhel}
- /sbin/service isatapd condrestart >/dev/null 2>&1 || :
- %endif
- /sbin/service miredo-server condrestart >/dev/null 2>&1 || :
/sbin/service miredo-client condrestart >/dev/null 2>&1 || :
fi
+%postun server
+if [ "$1" -ge "1" ] ; then
+ /sbin/service miredo-server condrestart >/dev/null 2>&1 || :
+fi
+
%clean
rm -rf %{buildroot}
-%files -f %{name}.lang
+%files libs -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README THANKS TODO rpmdocs/*
-%doc %{_mandir}/man?/miredo*
-%doc %{_mandir}/man1/teredo-mire*
+#%doc %{_mandir}/man?/miredo*
%dir %{_sysconfdir}/miredo
-%config(noreplace) %{_sysconfdir}/miredo/miredo.conf
-%config(noreplace) %{_sysconfdir}/miredo/client-hook
-%ghost %config(noreplace,missingok) %{_sysconfdir}/miredo/miredo-server.conf
-%{_sbindir}/miredo
-%{_sbindir}/miredo-checkconf
-%{_sbindir}/miredo-server
-%{_bindir}/teredo-mire
%{_libdir}/libteredo.so.*
%{_libdir}/libtun6.so.*
-%{_initrddir}/miredo-client
-%{_initrddir}/miredo-server
-
-%if 0%{?rhel}
-%{_sbindir}/isatapd
-%doc %{_mandir}/man5/isatapd.conf*
-%doc %{_mandir}/man8/isatapd*
-%{_initrddir}/isatapd
-%endif
-
+%{_libdir}/miredo/miredo-privproc
%files devel
%defattr(-,root,root,-)
@@ -155,8 +168,36 @@ rm -rf %{buildroot}
%{_libdir}/libteredo.so
%{_libdir}/libtun6.so
+%files server
+%defattr(-,root,root,-)
+%ghost %config(noreplace,missingok) %{_sysconfdir}/miredo/miredo-server.conf
+%{_bindir}/teredo-mire
+%{_sbindir}/miredo-server
+%{_sbindir}/miredo-checkconf
+%{_initrddir}/miredo-server
+%doc %{_mandir}/man1/teredo-mire*
+%doc %{_mandir}/man?/miredo-server*
+%doc %{_mandir}/man?/miredo-checkconf*
+
+
+%files client
+%defattr(-,root,root,-)
+%config(noreplace) %{_sysconfdir}/miredo/miredo.conf
+%config(noreplace) %{_sysconfdir}/miredo/client-hook
+%{_initrddir}/miredo-client
+%{_sbindir}/miredo
+%doc %{_mandir}/man?/miredo.*
+
%changelog
+* Sun Jul 19 2009 Jens Kuehnel <fedora-package at jens.kuehnel.org> 1.1.7-2
+- rename miredo to miredo-libs
+- fixes EL
+
+* Thu Jul 14 2009 Jens Kuehnel <fedora-package at jens.kuehnel.org> 1.1.7-1
+- split into server and client package
+- update to upstream 1.1.7
+
* Sat Jun 28 2009 Jens Kuehnel <fedora-package at jens.kuehnel.org> 1.1.6-2
- renamed miredo startscript to miredo-client
- preliminary preperation for EL
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/miredo/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources 1 Jul 2009 07:31:39 -0000 1.2
+++ sources 25 Jul 2009 13:44:59 -0000 1.3
@@ -1 +1 @@
-bf49c1ddc068746760787d0cf76e40de miredo-1.1.6.tar.bz2
+4fb5e7df6a6255528e4c5380401ad3ea miredo-1.1.7.tar.bz2
More information about the fedora-extras-commits
mailing list