update to 0.12.0
This commit is contained in:
parent
a3ed1ededf
commit
d7214adbd4
|
@ -1 +1,2 @@
|
||||||
/cairo-0.11.1.tar.gz
|
/cairo-0.11.1.tar.gz
|
||||||
|
/cairo-0.12.0.tar.gz
|
||||||
|
|
|
@ -1,12 +0,0 @@
|
||||||
diff -u cairo-0.11.1/Gtk2HsSetup.hs\~ cairo-0.11.1/Gtk2HsSetup.hs
|
|
||||||
--- cairo-0.11.1/Gtk2HsSetup.hs~ 2010-11-25 17:16:11.000000000 +1000
|
|
||||||
+++ cairo-0.11.1/Gtk2HsSetup.hs 2010-11-25 17:32:40.000000000 +1000
|
|
||||||
@@ -187,7 +187,7 @@
|
|
||||||
_ | modeGenerateRegFile -> die "Generate Reg File not supported"
|
|
||||||
| modeGenerateRegScript -> die "Generate Reg Script not supported"
|
|
||||||
| otherwise -> registerPackage verbosity
|
|
||||||
- installedPkgInfo pkg lbi inplace packageDb
|
|
||||||
+ installedPkgInfo pkg lbi inplace [packageDb]
|
|
||||||
|
|
||||||
where
|
|
||||||
modeGenerateRegFile = isJust (flagToMaybe (regGenPkgConf regFlags))
|
|
|
@ -15,8 +15,8 @@
|
||||||
%global debug_package %{nil}
|
%global debug_package %{nil}
|
||||||
|
|
||||||
Name: ghc-%{pkg_name}
|
Name: ghc-%{pkg_name}
|
||||||
Version: 0.11.1
|
Version: 0.12.0
|
||||||
Release: 2%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: %{common_summary}
|
Summary: %{common_summary}
|
||||||
|
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
|
@ -28,13 +28,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
ExclusiveArch: %{ix86} x86_64 ppc alpha
|
ExclusiveArch: %{ix86} x86_64 ppc alpha
|
||||||
BuildRequires: ghc, ghc-doc, ghc-prof
|
BuildRequires: ghc, ghc-doc, ghc-prof
|
||||||
BuildRequires: ghc-rpm-macros >= 0.8.1
|
BuildRequires: ghc-rpm-macros >= 0.8.1
|
||||||
BuildRequires: gtk2hs-buildtools
|
|
||||||
%if %{with hscolour}
|
%if %{with hscolour}
|
||||||
BuildRequires: hscolour
|
BuildRequires: hscolour
|
||||||
%endif
|
%endif
|
||||||
%{?ghc_pkg_deps:BuildRequires: %{ghc_pkg_deps}, %(echo %{ghc_pkg_deps} | sed -e "s/\(ghc-[^, ]\+\)-devel/\1-doc,\1-prof/g")}
|
%{?ghc_pkg_deps:BuildRequires: %{ghc_pkg_deps}, %(echo %{ghc_pkg_deps} | sed -e "s/\(ghc-[^, ]\+\)-devel/\1-doc,\1-prof/g")}
|
||||||
%{?ghc_pkg_c_deps:BuildRequires: %{ghc_pkg_c_deps}}
|
%{?ghc_pkg_c_deps:BuildRequires: %{ghc_pkg_c_deps}}
|
||||||
Patch1: ghc-cairo-Gtk2HsSetup-Cabal-1.10.patch
|
BuildRequires: gtk2hs-buildtools
|
||||||
|
|
||||||
%description
|
%description
|
||||||
%{common_description}
|
%{common_description}
|
||||||
|
@ -48,7 +47,6 @@ This package provides the shared library.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n %{pkg_name}-%{version}
|
%setup -q -n %{pkg_name}-%{version}
|
||||||
%patch1 -p1 -b .orig
|
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
@ -68,6 +66,10 @@ rm -rf $RPM_BUILD_ROOT
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Nov 30 2010 Jens Petersen <petersen@redhat.com> - 0.12.0-1
|
||||||
|
- update to 0.12.0
|
||||||
|
- Gtk2HsSetup patch no longer needed
|
||||||
|
|
||||||
* Thu Nov 25 2010 Jens Petersen <petersen@redhat.com> - 0.11.1-2
|
* Thu Nov 25 2010 Jens Petersen <petersen@redhat.com> - 0.11.1-2
|
||||||
- add ghc-cairo-Gtk2HsSetup-Cabal-1.10.patch to fix build
|
- add ghc-cairo-Gtk2HsSetup-Cabal-1.10.patch to fix build
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue