llaumgui pushed to backup-manager (f22). "Fix #1208596: backup-manager package uses /share/locale/ while every (..more)"

notifications at fedoraproject.org notifications at fedoraproject.org
Sun May 24 16:48:12 UTC 2015


From 347d8266c8fcde15ba19b95771fafc4738345c89 Mon Sep 17 00:00:00 2001
From: Guillaume Kulakowski <guillaume at kulakowski.fr>
Date: Sun, 24 May 2015 18:39:50 +0200
Subject: Fix #1208596: backup-manager package uses /share/locale/ while every
 other package use /usr/share/locale/


diff --git a/.gitignore b/.gitignore
index ac6c084..9017c96 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 backup-manager-0.7.9.tar.gz
 /backup-manager-0.7.10.tar.gz
 /backup-manager-0.7.10-b710665.tar.gz
+/Backup-Manager-b710665c784fad8e805a3e8cea4ebe2016615ca6.tar.gz
diff --git a/backup-manager-0.7.10-destdir.patch b/backup-manager-0.7.10-destdir.patch
new file mode 100644
index 0000000..68d9089
--- /dev/null
+++ b/backup-manager-0.7.10-destdir.patch
@@ -0,0 +1,11 @@
+--- backup-manager/Makefile.destdir
++++ backup-manager/Makefile
+@@ -89,7 +89,7 @@
+ 
+ # The translation stuff
+ install_po:
+-	$(MAKE) -C po install
++	$(MAKE) -C po install DESTDIR=$(DESTDIR) PREFIX=$(PREFIX)
+ 
+ # The backup-manager libraries
+ install_lib:
diff --git a/backup-manager.spec b/backup-manager.spec
index b267101..9df5d88 100644
--- a/backup-manager.spec
+++ b/backup-manager.spec
@@ -3,19 +3,20 @@
 
 Name:           backup-manager
 Version:        0.7.10
-Release:        13%{?dist}
+Release:        14%{?dist}
 Summary:        A command line backup tool for GNU/Linux
 
 Group:          Applications/System
 License:        GPLv2+
-# Tempory change URL and Source0 according https://github.com/sukria/Backup-Manager/issues/24
-URL:            http://github.com/sukria/Backup-Manager
-Source0:        https://github.com/sukria/Backup-Manager/archive/%{commit}/backup-manager-%{version}-%{shortcommit}.tar.gz
+URL:            https://github.com/sukria/Backup-Manager
+Source0:        https://github.com/sukria/Backup-Manager/archive/%{commit}/Backup-Manager-%{commit}.tar.gz
 Source1:        %{name}.cron.daily
+# Change default directory and add cron.daily support
 Patch0:         %{name}-configtpl.patch
 # Strict pod2man does not tolerate mistakes
 Patch1:         %{name}-0.7.10-Fix-POD-syntax.patch
-
+# Fix #1208596 - backup-manager package uses /share/locale/ while every other package use /usr/share/locale/
+Patch2:         %{name}-0.7.10-destdir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  gettext
@@ -62,6 +63,7 @@ for your needs.
 %setup -qn Backup-Manager-%{commit}
 %patch0 -p1 -b .configtpl
 %patch1 -p1 -b .pod
+%patch2 -p1 -b .destdir
 
 # Clean Makefile
 sed -i -e "s at install -o root -g 0 @install @" Makefile
@@ -118,6 +120,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun May 24 2015 Guillaume Kulakowski <guillaume.kulakowski at fedoraproject.org> - 0.7.10-14
+- Path for issue #1208596: backup-manager package uses /share/locale/ while every other package use /usr/share/locale/
+
 * Wed Aug 27 2014 Jitka Plesnikova <jplesnik at redhat.com> - 0.7.10-13
 - Perl 5.20 rebuild
 
diff --git a/sources b/sources
index aef8b08..93a632a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-febf93041e4d4a4c5ed4ccfc87558e15  backup-manager-0.7.10-b710665.tar.gz
+febf93041e4d4a4c5ed4ccfc87558e15  Backup-Manager-b710665c784fad8e805a3e8cea4ebe2016615ca6.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/backup-manager.git/commit/?h=f22&id=347d8266c8fcde15ba19b95771fafc4738345c89


More information about the scm-commits mailing list