[libgdiplus] - Merge-review cleanup (#226009)
paragn
paragn at fedoraproject.org
Mon Oct 4 06:46:07 UTC 2010
commit 1c36fbff5e305c1be30fac4a99a8f2cb7f3a179f
Author: paragn <paragn at fedoraproject.org>
Date: Mon Oct 4 12:20:13 2010 +0530
- Merge-review cleanup (#226009)
libgdiplus.spec | 20 ++++++++------------
1 files changed, 8 insertions(+), 12 deletions(-)
---
diff --git a/libgdiplus.spec b/libgdiplus.spec
index 280fd9f..53c952b 100644
--- a/libgdiplus.spec
+++ b/libgdiplus.spec
@@ -1,6 +1,6 @@
Name: libgdiplus
Version: 2.6.7
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: An Open Source implementation of the GDI+ API
Group: System Environment/Libraries
@@ -9,7 +9,6 @@ URL: http://www.mono-project.com/Main_Page
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
-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
@@ -23,7 +22,7 @@ Project
%package devel
Summary: Development files for libgdiplus
Group: Development/Libraries
-Requires: %{name} = %{version}-%{release} pkgconfig
+Requires: %{name} = %{version}-%{release}
%description devel
Development files for libgdiplus
@@ -37,13 +36,8 @@ Development files for libgdiplus
make %{?_smp_mflags}
%install
-rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}
-
-rm %{buildroot}%{_libdir}/*.la
-
-%clean
-rm -rf %{buildroot}
+make install DESTDIR=%{buildroot} INSTALL="install -p"
+find %{buildroot} -name '*.la' -exec rm -f {} ';'
%post -p /sbin/ldconfig
@@ -51,16 +45,18 @@ rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
-%doc COPYING NEWS README TODO MPL-1.1.html AUTHORS
+%doc COPYING NEWS README TODO AUTHORS ChangeLog
%{_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)
+
* Tue Aug 24 2010 Christian Krause <chkr at fedoraproject.org> - 2.6.7-3
- Add upstream patch for CVE-2010-1526
More information about the scm-commits
mailing list