teuf pushed to phodav (f22). "Update to phodav 2.0"

Thu Apr 2 11:24:30 UTC 2015

>From bdf09f78eb8af39473c015cd027c6134cff7f303 Mon Sep 17 00:00:00 2001
From: Christophe Fergeau <cfergeau at redhat.com>
Date: Thu, 2 Apr 2015 13:22:17 +0200
Subject: Update to phodav 2.0

diff --git a/.gitignore b/.gitignore
index 05c8217..a87d687 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /phodav-0.4.tar.xz
+/phodav-2.0.tar.xz
diff --git a/0001-Add-version-prefix-to-gettext-and-doc-directories.patch b/0001-Add-version-prefix-to-gettext-and-doc-directories.patch
new file mode 100644
index 0000000..6b39c69
--- /dev/null
+++ b/0001-Add-version-prefix-to-gettext-and-doc-directories.patch
@@ -0,0 +1,39 @@
+From 65b410ddd9b6a797eb54c865e6365365604bc847 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau at gmail.com>
+Date: Tue, 24 Feb 2015 22:41:39 +0100
+Subject: [PATCH] Add version prefix to gettext and doc directories
+
+---
+ configure.ac              | 2 +-
+ doc/reference/Makefile.am | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 0fe907e..d87524e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -55,7 +55,7 @@ gl_WARN_ADD([-Wno-sign-compare])
+ gl_WARN_ADD([-Wno-unused-parameter])
+ gl_WARN_ADD([-Wno-missing-field-initializers])
+ 
+-GETTEXT_PACKAGE=phodav
++GETTEXT_PACKAGE=phodav-2.0
+ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, ["$GETTEXT_PACKAGE"], [Define to the Gettext package name])
+ AC_SUBST(GETTEXT_PACKAGE)
+ IT_PROG_INTLTOOL([0.40.0])
+diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
+index dfad455..c89ab35 100644
+--- a/doc/reference/Makefile.am
++++ b/doc/reference/Makefile.am
+@@ -1,7 +1,7 @@
+ NULL =
+ AUTOMAKE_OPTIONS = 1.6
+ 
+-DOC_MODULE = phodav
++DOC_MODULE = phodav-2.0
+ DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.sgml
+ DOC_SOURCE_DIR = $(top_srcdir)/libphodav
+ 
+-- 
+2.1.0
+
diff --git a/0001-webdavd-remove-systemd-target-use-only-service.patch b/0001-webdavd-remove-systemd-target-use-only-service.patch
deleted file mode 100644
index 4375397..0000000
--- a/0001-webdavd-remove-systemd-target-use-only-service.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From d2a11492d9bbfebdea31ec477d62dc747af0510c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau at gmail.com>
-Date: Mon, 5 May 2014 15:44:30 +0200
-Subject: [PATCH] webdavd: remove systemd target, use only service
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1087907
----
- Makefile.am                 | 2 +-
- data/70-spice-webdavd.rules | 2 +-
- data/spice-webdavd.service  | 3 ---
- data/spice-webdavd.target   | 2 --
- 4 files changed, 2 insertions(+), 7 deletions(-)
- delete mode 100644 data/spice-webdavd.target
-
-diff --git a/Makefile.am b/Makefile.am
-index e9ce4a7..680371d 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -142,7 +142,7 @@ if HAVE_SYSTEMD
- systemdunitdir = $(SYSTEMDSYSTEMUNITDIR)
- dist_systemdunit_DATA = \
- 	$(top_srcdir)/data/spice-webdavd.service \
--	$(top_srcdir)/data/spice-webdavd.target
-+	$(NULL)
- endif
- 
- if HAVE_UDEV
-diff --git a/data/70-spice-webdavd.rules b/data/70-spice-webdavd.rules
-index 0088be3..0fd894d 100644
---- a/data/70-spice-webdavd.rules
-+++ b/data/70-spice-webdavd.rules
-@@ -1 +1 @@
--ACTION=="add", SUBSYSTEM=="virtio-ports", ENV{DEVLINKS}=="/dev/virtio-ports/org.spice-space.webdav.0", ENV{SYSTEMD_WANTS}="spice-webdavd.target"
-+ACTION=="add", SUBSYSTEM=="virtio-ports", ENV{DEVLINKS}=="/dev/virtio-ports/org.spice-space.webdav.0", ENV{SYSTEMD_WANTS}="spice-webdavd.service"
-diff --git a/data/spice-webdavd.service b/data/spice-webdavd.service
-index 328a84d..a7c3104 100644
---- a/data/spice-webdavd.service
-+++ b/data/spice-webdavd.service
-@@ -8,6 +8,3 @@ Type=simple
- EnvironmentFile=-/etc/sysconfig/spice-webdavd
- ExecStart=/usr/sbin/spice-webdavd -p 9843 $SPICE_WEBDAVD_EXTRA_ARGS
- Restart=on-success
--
--[Install]
--WantedBy=spice-webdavd.target
-diff --git a/data/spice-webdavd.target b/data/spice-webdavd.target
-deleted file mode 100644
-index 7417025..0000000
---- a/data/spice-webdavd.target
-+++ /dev/null
-@@ -1,2 +0,0 @@
--[Unit]
--Description=webdav daemon for Spice guests
--- 
-1.8.5.3
-
diff --git a/phodav.spec b/phodav.spec
index 675604c..d16f615 100644
--- a/phodav.spec
+++ b/phodav.spec
@@ -1,14 +1,12 @@
 Name:           phodav
-Version:        0.4
-Release:        5%{?dist}
+Version:        2.0
+Release:        1%{?dist}
 Summary:        A WebDAV server using libsoup
 Group:          Applications/Internet
 License:        LGPLv2+
 URL:            https://wiki.gnome.org/phodav
-Source0:        http://download.gnome.org/sources/%{name}/0.3/%{name}-%{version}.tar.xz
-
-Patch1:         0001-webdavd-remove-systemd-target-use-only-service.patch
- 
+Source0:        http://download.gnome.org/sources/%{name}/2.0/%{name}-%{version}.tar.xz
+Patch0:         0001-Add-version-prefix-to-gettext-and-doc-directories.patch
 BuildRequires:  systemd-devel
 BuildRequires:  systemd-units
 BuildRequires:  libsoup-devel
@@ -22,19 +20,23 @@ BuildRequires:  autoconf automake libtool
 %description
 phởdav is a WebDAV server implementation using libsoup (RFC 4918).
 
-%package -n     libphodav-1.0
+%package -n     libphodav
 Summary:        A library to serve files with WebDAV
+# no Provides for this one as ABI was broken
+Obsoletes:      libphodav-1.0 <= 0:0.4-6
 
-%description -n libphodav-1.0
+%description -n libphodav
 phởdav is a WebDAV server implementation using libsoup (RFC 4918).
 This package provides the library.
 
-%package -n     libphodav-1.0-devel
-Summary:        A library to
-Requires:       libphodav-1.0%{?_isa} = %{version}-%{release}
+%package -n     libphodav-devel
+Summary:        Development files for libphodav
+Requires:       libphodav%{?_isa} = %{version}-%{release}
+# no Provides for this one as ABI was broken
+Obsoletes:      libphodav-1.0-devel <= 0:0.4-6
 
-%description -n libphodav-1.0-devel
-The libphodav-1.0-devel package includes the header files for libphodav-1.0.
+%description -n libphodav-devel
+The libphodav-devel package includes the header files for libphodav.
 
 %package -n     chezdav
 Summary:        A simple WebDAV server program
@@ -57,7 +59,8 @@ the Spice virtio channel.
 
 %prep
 %setup -q
-%patch1 -p1
+%patch0 -p1
+
 autoreconf -fi
 
 %build
@@ -70,10 +73,10 @@ make %{?_smp_mflags}
 rm -f %{buildroot}%{_libdir}/*.a
 rm -f %{buildroot}%{_libdir}/*.la
 
-%find_lang %{name} --with-gnome
+%find_lang phodav-2.0 --with-gnome
 
-%post -n libphodav-1.0 -p /sbin/ldconfig
-%postun -n libphodav-1.0 -p /sbin/ldconfig
+%post -n libphodav -p /sbin/ldconfig
+%postun -n libphodav -p /sbin/ldconfig
 
 %post -n spice-webdavd
 %systemd_post spice-webdavd.service
@@ -84,16 +87,16 @@ rm -f %{buildroot}%{_libdir}/*.la
 %postun -n spice-webdavd
 %systemd_postun_with_restart spice-webdavd.service
 
-%files -n libphodav-1.0 -f %{name}.lang
+%files -n libphodav -f phodav-2.0.lang
 %doc NEWS COPYING
-%{_libdir}/libphodav-1.0.so.0*
+%{_libdir}/libphodav-2.0.so.0*
 
-%files -n libphodav-1.0-devel
-%dir %{_includedir}/libphodav-1.0/
-%{_includedir}/libphodav-1.0/*
-%{_libdir}/libphodav-1.0.so
-%{_libdir}/pkgconfig/libphodav-1.0.pc
-%{_datadir}/gtk-doc/html/phodav/*
+%files -n libphodav-devel
+%dir %{_includedir}/libphodav-2.0/
+%{_includedir}/libphodav-2.0/*
+%{_libdir}/libphodav-2.0.so
+%{_libdir}/pkgconfig/libphodav-2.0.pc
+%{_datadir}/gtk-doc/html/phodav-2.0/*
 
 %files -n chezdav
 %{_bindir}/chezdav
@@ -106,6 +109,10 @@ rm -f %{buildroot}%{_libdir}/*.la
 %{_unitdir}/spice-webdavd.service
 
 %changelog
+* Thu Apr 02 2015 Christophe Fergeau <cfergeau at redhat.com> 2.0-1
+- Update to phodav 2.0
+- Rename package from libphodav-1.0 to libphodav
+
 * Sun Aug 17 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
diff --git a/sources b/sources
index 95cbc0d..28f0e19 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-02036f62c7094a11123924c6d5605c9f  phodav-0.4.tar.xz
+f91d8db3d86fb9e74e03258781be4d2b  phodav-2.0.tar.xz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/phodav.git/commit/?h=f22&id=bdf09f78eb8af39473c015cd027c6134cff7f303
