[libgdiplus] - Correct URL - Revert merge-review cleanup (#226009)

Paul F. Johnson pfj at fedoraproject.org
Thu Oct 14 06:52:31 UTC 2010


commit ddeeee30b3c6ac1d9344641d8696feea563b8d61
Author: Paul F. Johnson <paul at all-the-johnsons.co.uk>
Date:   Thu Oct 14 07:52:23 2010 +0100

    - Correct URL
    - Revert merge-review cleanup (#226009)

 libgdiplus.spec |   26 +++++++++++---------------
 1 files changed, 11 insertions(+), 15 deletions(-)
---
diff --git a/libgdiplus.spec b/libgdiplus.spec
index e0d5ebe..5eee3b8 100644
--- a/libgdiplus.spec
+++ b/libgdiplus.spec
@@ -1,16 +1,14 @@
 Name:           libgdiplus
 Version:        2.8
-Release:        1.1%{?dist}
+Release:        2%{?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
-Source0:	http://mono.ximian.com/monobuild/preview/sources-preview/%{name}/%{name}-%{version}.tar.bz2
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
+#Source0:	http://mono.ximian.com/monobuild/preview/sources-preview/%{name}/%{name}-%{version}.tar.bz2
 BuildRequires:  freetype-devel glib2-devel libjpeg-devel libtiff-devel
 BuildRequires:  libungif-devel libpng-devel fontconfig-devel
 BuildRequires:  cairo-devel giflib-devel libexif-devel
@@ -23,7 +21,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
@@ -36,13 +34,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
 
@@ -50,16 +43,19 @@ 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
+* Thu Oct 14 2010 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.8-2
+- Correct URL
+- Revert 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
 


More information about the scm-commits mailing list