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?= +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?= -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 c46fccd..95c90cd 100644 --- a/phodav.spec +++ b/phodav.spec @@ -1,12 +1,12 @@ Name: phodav Version: 2.0 -Release: 1%{?dist} +Release: 2%{?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 - +Patch0: 0001-Add-version-prefix-to-gettext-and-doc-directories.patch BuildRequires: systemd-devel BuildRequires: systemd-units BuildRequires: libsoup-devel @@ -55,6 +55,7 @@ the Spice virtio channel. %prep %setup -q +%patch0 -p1 autoreconf -fi @@ -68,7 +69,7 @@ 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-2.0 -p /sbin/ldconfig %postun -n libphodav-2.0 -p /sbin/ldconfig @@ -82,7 +83,7 @@ rm -f %{buildroot}%{_libdir}/*.la %postun -n spice-webdavd %systemd_postun_with_restart spice-webdavd.service -%files -n libphodav-2.0 -f %{name}.lang +%files -n libphodav-2.0 -f phodav-2.0.lang %doc NEWS COPYING %{_libdir}/libphodav-2.0.so.0* @@ -91,7 +92,7 @@ rm -f %{buildroot}%{_libdir}/*.la %{_includedir}/libphodav-2.0/* %{_libdir}/libphodav-2.0.so %{_libdir}/pkgconfig/libphodav-2.0.pc -%{_datadir}/gtk-doc/html/phodav/* +%{_datadir}/gtk-doc/html/phodav-2.0/* %files -n chezdav %{_bindir}/chezdav @@ -104,6 +105,9 @@ rm -f %{buildroot}%{_libdir}/*.la %{_unitdir}/spice-webdavd.service %changelog +* Tue Feb 24 2015 Marc-André Lureau - 2.0-2 +- Fix gettext and doc to be under -2.0 directories. Fixes: rhbz#1195913 + * Sat Feb 21 2015 Marc-André Lureau - 2.0-1 - Bump to libphodav-2.0