Attachment 908255 Details for Bug 1106676 – patch 2

[patch] patch 2

0001-Fix-FTBFS-due-to-maven-changes-1106676.patch (text/plain), 1.49 KB, created by Yaakov Selkowitz on 2014-06-12 18:20:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yaakov Selkowitz

Created: 2014-06-12 18:20:24 UTC

Size: 1.49 KB

patch

obsolete

>From 9470b5a657ee4eca0d6195b64550c78dac09ce15 Mon Sep 17 00:00:00 2001
>From: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
>Date: Thu, 12 Jun 2014 10:09:18 -0500
>Subject: [PATCH] Fix FTBFS due to maven changes (#1106676)
>
>---
> protobuf.spec | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
>diff --git a/protobuf.spec b/protobuf.spec
>index 3fd3419..ec89637 100644
>--- a/protobuf.spec
>+++ b/protobuf.spec
>@@ -16,7 +16,7 @@
> Summary:        Protocol Buffers - Google's data interchange format
> Name:           protobuf
> Version:        2.5.0
>-Release:        8%{?dist}
>+Release:        9%{?dist}
> License:        BSD
> Group:          Development/Libraries
> Source:         http://protobuf.googlecode.com/files/protobuf-%{version}.tar.bz2
>@@ -336,11 +336,8 @@ install -p -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{emacs_startdir}
> %{emacs_lispdir}/protobuf-mode.el
> 
> %if %{with java}
>-%files java
>+%files java -f java/.mfiles
> %defattr(-, root, root, -)
>-%{_mavenpomdir}/JPP-%{name}.pom
>-%{_mavendepmapfragdir}/%{name}
>-%{_javadir}/%{name}.jar
> %doc examples/AddPerson.java examples/ListPeople.java
> 
> %files javadoc
>@@ -349,6 +346,9 @@ install -p -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{emacs_startdir}
> %endif
> 
> %changelog
>+* Wed Jun 11 2014 Yaakov Selkowitz <yselkowi@redhat.com> - 2.5.0-9
>+- Fix FTBFS due to maven changes (#1106676)
>+
> * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.5.0-8
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
> 
>-- 
>1.9.3
>

Actions: View | Diff

Attachments on bug 1106676: 904991 | 904992 | 904993 | 907869 | 908255