rpms/miredo/EL-5 miredo.spec,1.2,1.3

[Jens Kuehnel]

Author: jens

Update of /cvs/pkgs/rpms/miredo/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9754/EL-5

Modified Files:
	miredo.spec 
Log Message:
Update to 1.1.7-4
Fixes the obsolete bug 515506




Index: miredo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/miredo/EL-5/miredo.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- miredo.spec	25 Jul 2009 12:37:43 -0000	1.2
+++ miredo.spec	6 Aug 2009 08:39:55 -0000	1.3
@@ -1,7 +1,14 @@
 # vim: expandtab
+
+%if 0%{?rhel}
+%define withjudy 0
+%else
+%define withjudy 1
+%endif
+
 Name:           miredo
 Version:        1.1.7
-Release:        2%{?dist}
+Release:        4%{?dist}
 Summary:        Tunneling of IPv6 over UDP through NATs
 
 Group:          Applications/Internet
@@ -13,7 +20,12 @@ Source2:        miredo-server.init
 Patch0:         miredo-config-not-exec
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:    libcap-devel Judy-devel
+BuildRequires:    libcap-devel 
+%if %{withjudy}
+BuildRequires:     Judy-devel
+%endif
+
+
 Requires(pre):    shadow-utils
 Requires(post):   chkconfig, /sbin/ldconfig
 # This is for /sbin/service
@@ -68,7 +80,7 @@ Summary:        Tunneling client for IPv
 Group:          Applications/Internet
 Requires:       %{name}-libs = %{version}-%{release}
 Provides:       %{name} = %{version}-%{release}
-Obsoletes:      %{name} = 1.1.6-2
+Obsoletes:      %{name} <= 1.1.6
 
 
 %description client
@@ -85,7 +97,10 @@ part of miredo. Most people only need th
                --disable-static \
                --disable-rpath \
                --enable-miredo-user \
-               --without-Judy
+%if %{withjudy} == 0
+               --without-Judy \
+%endif
+
 
 # rpath does not really work
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
@@ -159,7 +174,7 @@ rm -rf %{buildroot}
 %dir %{_sysconfdir}/miredo
 %{_libdir}/libteredo.so.*
 %{_libdir}/libtun6.so.*
-%{_libdir}/miredo/miredo-privproc
+%{_libdir}/miredo/
 
 %files devel
 %defattr(-,root,root,-)
@@ -190,6 +205,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Jul 30 2009 Jens Kuehnel <fedora-package at jens.kuehnel.org> 1.1.7-4
+- Fix Obsoletes for smooth upgrade
+
+* Tue Jul 28 2009 Jens Kuehnel <fedora-package at jens.kuehnel.org> 1.1.7-3
+- without July as optional, hopefully the last EL fix
+
 * Sun Jul 19 2009 Jens Kuehnel <fedora-package at jens.kuehnel.org> 1.1.7-2
 - rename miredo to miredo-libs
 - fixes EL