teuf pushed to phodav (master). "Fix libphodav* naming (..more)"

[notifications at fedoraproject.org]

>From 74712119f4e44e54d134f69bbee32258b61e6e16 Mon Sep 17 00:00:00 2001
From: Christophe Fergeau <cfergeau at redhat.com>
Date: Wed, 25 Feb 2015 09:20:49 +0100
Subject: Fix libphodav* naming

The phodav packages contain an unneeded version number in their name.
Since there were builds using phodav-2.0 and others using phodav2, this
provides/obsoletes both names.

diff --git a/phodav.spec b/phodav.spec
index 5aac6fa..e1c8ef1 100644
--- a/phodav.spec
+++ b/phodav.spec
@@ -1,6 +1,6 @@
 Name:           phodav
 Version:        2.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A WebDAV server using libsoup
 Group:          Applications/Internet
 License:        LGPLv2+
@@ -20,19 +20,31 @@ BuildRequires:  autoconf automake libtool
 %description
 phởdav is a WebDAV server implementation using libsoup (RFC 4918).
 
-%package -n     libphodav2
+%package -n     libphodav
 Summary:        A library to serve files with WebDAV
-
-%description -n libphodav2
+Provides:       libphodav-2.0 = 0:%{version}-%{release}
+Provides:       libphodav2 = 0:%{version}-%{release}
+Obsoletes:      libphodav-2.0 <= 0:2.0-3
+Obsoletes:      libphodav2 <= 0:2.0-4
+# no Provides for this one as ABI was broken
+Obsoletes:      libphodav-1.0 <= 0:0.4-6
+
+%description -n libphodav
 phởdav is a WebDAV server implementation using libsoup (RFC 4918).
 This package provides the library.
 
-%package -n     libphodav2-devel
-Summary:        A library to
-Requires:       libphodav2%{?_isa} = %{version}-%{release}
+%package -n     libphodav-devel
+Summary:        Development files for libphodav
+Requires:       libphodav%{?_isa} = %{version}-%{release}
+Provides:       libphodav-2.0-devel = 0:%{version}-%{release}
+Provides:       libphodav2-devel = 0:%{version}-%{release}
+Obsoletes:      libphodav-2.0-devel <= 0:2.0-3
+Obsoletes:      libphodav2-devel <= 0:2.0-4
+# no Provides for this one as ABI was broken
+Obsoletes:      libphodav-1.0-devel <= 0:0.4-6
 
-%description -n libphodav2-devel
-The libphodav2-devel package includes the header files for libphodav2.
+%description -n libphodav-devel
+The libphodav-devel package includes the header files for libphodav.
 
 %package -n     chezdav
 Summary:        A simple WebDAV server program
@@ -71,8 +83,8 @@ rm -f %{buildroot}%{_libdir}/*.la
 
 %find_lang phodav-2.0 --with-gnome
 
-%post -n libphodav2 -p /sbin/ldconfig
-%postun -n libphodav2 -p /sbin/ldconfig
+%post -n libphodav -p /sbin/ldconfig
+%postun -n libphodav -p /sbin/ldconfig
 
 %post -n spice-webdavd
 %systemd_post spice-webdavd.service
@@ -83,11 +95,11 @@ rm -f %{buildroot}%{_libdir}/*.la
 %postun -n spice-webdavd
 %systemd_postun_with_restart spice-webdavd.service
 
-%files -n libphodav2 -f phodav-2.0.lang
+%files -n libphodav -f phodav-2.0.lang
 %doc NEWS COPYING
 %{_libdir}/libphodav-2.0.so.0*
 
-%files -n libphodav2-devel
+%files -n libphodav-devel
 %dir %{_includedir}/libphodav-2.0/
 %{_includedir}/libphodav-2.0/*
 %{_libdir}/libphodav-2.0.so
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/phodav.git/commit/?h=master&id=74712119f4e44e54d134f69bbee32258b61e6e16