[libgdiplus] Bump to 2.8 release Remove CVE patch (fixed)

Paul F. Johnson pfj at fedoraproject.org
Wed Oct 13 00:06:32 UTC 2010


commit 5c1e0af1b68ae0771fd110580840242f5f35a9e4
Author: Paul F. Johnson <paul at all-the-johnsons.co.uk>
Date:   Wed Oct 13 01:06:22 2010 +0100

    Bump to 2.8 release
    Remove CVE patch (fixed)

 .gitignore                                         |    1 +
 ...-overflows-when-loading-images-see-bnc-63.patch |  215 --------------------
 libgdiplus.spec                                    |   32 ++-
 sources                                            |    2 +-
 4 files changed, 23 insertions(+), 227 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8dc7453..d68ab7b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 libgdiplus-2.6.7.tar.bz2
+/libgdiplus-2.8.tar.bz2
diff --git a/libgdiplus.spec b/libgdiplus.spec
index 53c952b..e0d5ebe 100644
--- a/libgdiplus.spec
+++ b/libgdiplus.spec
@@ -1,14 +1,15 @@
 Name:           libgdiplus
-Version:        2.6.7
-Release:        4%{?dist}
+Version:        2.8
+Release:        1.1%{?dist}
 Summary:        An Open Source implementation of the GDI+ API
 
 Group:          System Environment/Libraries
 License:        MIT
 URL:            http://www.mono-project.com/Main_Page
-Source0:        http://ftp.novell.com/pub/mono/sources/%{name}/%{name}-%{version}.tar.bz2
+#Source0:        http://ftp.novell.com/pub/mono/sources/%{name}/%{name}-%{version}.tar.bz2
 # http://github.com/mono/libgdiplus/commit/6779fbf994d5270720ccb1687ba8b004e20a1821
-Patch0:         0001-Fix-integer-overflows-when-loading-images-see-bnc-63.patch
+Source0:	http://mono.ximian.com/monobuild/preview/sources-preview/%{name}/%{name}-%{version}.tar.bz2
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  freetype-devel glib2-devel libjpeg-devel libtiff-devel
 BuildRequires:  libungif-devel libpng-devel fontconfig-devel
@@ -22,22 +23,26 @@ Project
 %package devel
 Summary: Development files for libgdiplus
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{version}-%{release} pkgconfig
 
 %description devel
 Development files for libgdiplus
 
 %prep
 %setup -q 
-%patch0 -p1 -b CVE-2010-1526
 
 %build
 %configure --disable-static 
 make %{?_smp_mflags}
 
 %install
-make install DESTDIR=%{buildroot} INSTALL="install -p"
-find %{buildroot} -name '*.la' -exec rm -f {} ';'
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
+
+rm %{buildroot}%{_libdir}/*.la
+
+%clean
+rm -rf %{buildroot}
 
 %post -p /sbin/ldconfig
 
@@ -45,17 +50,22 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING NEWS README TODO AUTHORS ChangeLog
+%doc COPYING NEWS README TODO MPL-1.1.html AUTHORS
 %{_libdir}/lib*.so.*
 
 %files devel
 %defattr(-,root,root,-)
+%doc ChangeLog
 %{_libdir}/pkgconfig/*
 %{_libdir}/lib*.so
 
 %changelog
-* Fri Sep 24 2010 Parag Nemade <paragn AT fedoraproject.org> - 2.6.7-4
-- Merge-review cleanup (#226009)
+* Thu Oct 07 2010 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.8-1.1
+- Bump to full release
+
+* Wed Sep 15 2010 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.8-1
+- Bump to review 3 of the 2.8 release
+- Remove patch for CVE-2010-1526
 
 * Tue Aug 24 2010 Christian Krause <chkr at fedoraproject.org> - 2.6.7-3
 - Add upstream patch for CVE-2010-1526
diff --git a/sources b/sources
index 7745fda..8a5f4e4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6448c2dd9a63ccdd69cb305e0ce4d40b  libgdiplus-2.6.7.tar.bz2
+4fd70e5ab7847574c20453c349bc4c97  libgdiplus-2.8.tar.bz2


More information about the scm-commits mailing list