Attachment 640109 Details for Bug 874114 – Patch including update to latest upstream

[patch] Patch including update to latest upstream

0001-Update-to-latest-upstream.patch (text/plain), 2.59 KB, created by Stanislav Ochotnicky on 2012-11-07 14:39:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stanislav Ochotnicky

Created: 2012-11-07 14:39:13 UTC

Size: 2.59 KB

patch

obsolete

>From 6fd4c06079b1ce19b9e0626b4fe65656672971bc Mon Sep 17 00:00:00 2001
>From: Stanislav Ochotnicky <sochotnicky@redhat.com>
>Date: Wed, 7 Nov 2012 15:38:15 +0100
>Subject: [PATCH] Update to latest upstream
>
>- Drop all patches (upstreamed)
>- Small packaging cleanups
>---
> .gitignore  |  1 +
> libEMF.spec | 27 +++++++--------------------
> sources     |  2 +-
> 3 files changed, 9 insertions(+), 21 deletions(-)
>
>diff --git a/.gitignore b/.gitignore
>index 5c6d768..fcd6e96 100644
>--- a/.gitignore
>+++ b/.gitignore
>@@ -1,2 +1,3 @@
> libEMF-1.0.4.tar.gz
> /libEMF-1.0.6.tar.gz
>+/libEMF-1.0.7.tar.gz
>diff --git a/libEMF.spec b/libEMF.spec
>index 7ac2d1d..1df1882 100644
>--- a/libEMF.spec
>+++ b/libEMF.spec
>@@ -1,19 +1,13 @@
> Summary:	A library for generating Enhanced Metafiles
> Summary(pl):	Biblioteka do generowania plikÃ³w w formacie Enhanced Metafile
> Name:		libEMF
>-Version:	1.0.6
>-Release:	2%{?dist}
>+Version:	1.0.7
>+Release:	1%{?dist}
> License:	LGPLv2+ and GPLv2+
> Group:		System Environment/Libraries
> URL:		http://libemf.sourceforge.net/
> 
> Source0:	http://downloads.sourceforge.net/project/libemf/libemf/%{version}/libEMF-%{version}.tar.gz
>-# Source0-md5:	a4e91fd8077ce5f540f569e20e8ef7ff
>-Patch0:		%{name}-amd64.patch
>-Patch1:		%{name}-axp.patch
>-Patch2:		%{name}-s390.patch
>-Patch3:		%{name}-arm.patch
>-Patch4:         %{name}-lp64.patch
> BuildRequires:	libstdc++-devel
> BuildRequires:	libtool
> 
>@@ -46,20 +40,10 @@ Pliki nagÅÃ³wkowe libEMF.
> 
> %prep
> %setup -q
>-%patch0 -p1 -b .amd64
>-%patch1 -p1 -b .axp
>-%patch2 -p1 -b .s390
>-%patch3 -p1 -b .arm
>-%patch4 -p1 -b .lp64
> 
> chmod 0644 libemf/libemf.h
> 
> %build
>-# supplied libtool is broken (no C++ libraries support)
>-libtoolize --force
>-aclocal
>-autoconf
>-automake
> %configure \
> 	--disable-static \
> 	--enable-editing
>@@ -80,18 +64,21 @@ make check
> %postun	-p /sbin/ldconfig
> 
> %files
>-%defattr(644,root,root,755)
> %doc AUTHORS ChangeLog COPYING COPYING.LIB NEWS README
> %attr(755,root,root) %{_bindir}/*
> %attr(755,root,root) %{_libdir}/lib*.so.*
> 
> %files devel
>-%defattr(644,root,root,755)
> %doc doc/html
> %attr(755,root,root) %{_libdir}/lib*.so
> %{_includedir}/libEMF
> 
> %changelog
>+* Wed Nov 07 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.0.7-1
>+- Update to latest upstream
>+- Drop all patches (upstreamed)
>+- Small packaging cleanups
>+
> * Mon Nov  5 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.0.6-2
> - Fixes for non-x86 64bit architectures
> 
>diff --git a/sources b/sources
>index 815943c..3f9d067 100644
>--- a/sources
>+++ b/sources
>@@ -1 +1 @@
>-bce826c7fa3cfbc4cdc258d2bfdd75d4  libEMF-1.0.6.tar.gz
>+f1011f5cc254aa228be78704fe5f9960  libEMF-1.0.7.tar.gz
>-- 
>1.7.11.7
>

Actions: View | Diff

Attachments on bug 874114: 640109