robert pushed to arj (el5). "- Fix FTBFS: added arj-3.10.22-quotes.patch"

notifications at fedoraproject.org notifications at fedoraproject.org
Fri Apr 3 14:07:10 UTC 2015


>From 307c35c897247650471f168c90800cc40743320f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milo=C5=A1=20Jakub=C3=AD=C4=8Dek?=
 <mjakubicek at fedoraproject.org>
Date: Mon, 7 Sep 2009 08:30:08 +0000
Subject: - Fix FTBFS: added arj-3.10.22-quotes.patch


diff --git a/arj-3.10.22-quotes.patch b/arj-3.10.22-quotes.patch
new file mode 100644
index 0000000..fa57afc
--- /dev/null
+++ b/arj-3.10.22-quotes.patch
@@ -0,0 +1,22 @@
+--- arj-3.10.22/makefile.orig	2009-09-07 07:50:22.000000000 +0200
++++ arj-3.10.22/makefile	2009-09-07 07:50:32.000000000 +0200
+@@ -1633,7 +1633,7 @@
+  $(CC) $(ARJ_COPT)
+ $(BASEDIR)\fmsg_arj.c $(BASEDIR)\imsg_arj.c $(BASEDIR)\nmsg_arj.c: $(BASEDIR)\tools\$(MSGBIND) $(RESFILE)
+  $(BASEDIR)\tools\msgbind $(RESFILE) msg_arj $(OS_ID) $(PACKAGE) $(LOCALE) $(BASEDIR)
+-
++ sed -i 's|_""|\\""|' $(BASEDIR)/fmsg_arj.c
+ #
+ # REARJ utility
+ #
+--- arj-3.10.22/gnu/makefile.in.orig	2004-04-17 13:28:06.000000000 +0200
++++ arj-3.10.22/gnu/makefile.in	2009-09-07 07:58:42.000000000 +0200
+@@ -356,7 +356,7 @@
+ 
+ $(BASEDIR)/fmsg_arj.c $(BASEDIR)/imsg_arj.c $(BASEDIR)/nmsg_arj.c: $(TOOLS_DIR)/msgbind$x $(RESFILE)
+ 	$(TOOLS_DIR)/msgbind $(RESFILE) msg_arj $(OS_ID) $(PACKAGE) $(LOCALE) $(BASEDIR)
+-
++	sed -i 's|_""|\\""|' $(BASEDIR)/fmsg_arj.c
+ #
+ # REARJ utility
+ #
diff --git a/arj.spec b/arj.spec
index 1cfbd11..e60b898 100644
--- a/arj.spec
+++ b/arj.spec
@@ -1,7 +1,7 @@
 Summary:	Archiver for .arj files
 Name:		arj
 Version:	3.10.22
-Release:	10%{?dist}
+Release:	11%{?dist}
 License:	GPL+
 Group:		Applications/Archiving
 URL:		http://arj.sourceforge.net/
@@ -12,6 +12,8 @@ Source2:	unarj.1
 Patch0:		http://ftp.debian.org/debian/pool/main/a/%{name}/%{name}_%{version}-6.diff.gz
 Patch1:		arj-3.10.22-missing-protos.patch
 Patch2:		arj-3.10.22-custom-printf.patch
+# Filed into upstream bugtracker as https://sourceforge.net/tracker/?func=detail&aid=2853421&group_id=49820&atid=457566
+Patch3:		arj-3.10.22-quotes.patch
 BuildRequires:	autoconf
 Provides:	unarj = %{version}-%{release}
 Obsoletes:	unarj < 3
@@ -28,6 +30,7 @@ Software, Inc.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 for i in debian/patches/00*.patch; do
   patch -p1 < $i
@@ -69,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*arj*1.*
 
 %changelog
+* Sun Sep  6 2009 Milos Jakubicek <xjakub at fi.muni.cz> 3.10.22-11
+- Fix FTBFS: added arj-3.10.22-quotes.patch
+
 * Wed Aug 19 2009 Robert Scheck <robert at fedoraproject.org> 3.10.22-10
 - Disabled the even with patches broken parallel builds again
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/arj.git/commit/?h=el5&id=307c35c897247650471f168c90800cc40743320f


More information about the scm-commits mailing list