update to 0.12.0
This commit is contained in:
parent
4916ea7fbe
commit
8442c4e75c
|
@ -1,2 +1,3 @@
|
||||||
/glib-0.11.1.tar.gz
|
/glib-0.11.1.tar.gz
|
||||||
/glib-0.11.2.tar.gz
|
/glib-0.11.2.tar.gz
|
||||||
|
/glib-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))
|
|
|
@ -10,8 +10,8 @@
|
||||||
%global ghc_pkg_obsoletes ghc-gconf-devel < 0.11, ghc-gstreamer-devel < 0.11, ghc-svgcairo-devel < 0.11, ghc-gtk2hs-doc < 0.11
|
%global ghc_pkg_obsoletes ghc-gconf-devel < 0.11, ghc-gstreamer-devel < 0.11, ghc-svgcairo-devel < 0.11, ghc-gtk2hs-doc < 0.11
|
||||||
|
|
||||||
Name: ghc-%{pkg_name}
|
Name: ghc-%{pkg_name}
|
||||||
Version: 0.11.2
|
Version: 0.12.0
|
||||||
Release: 4%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: %{common_summary}
|
Summary: %{common_summary}
|
||||||
|
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
|
@ -27,7 +27,6 @@ BuildRequires: ghc-rpm-macros >= 0.8.2
|
||||||
BuildRequires: hscolour
|
BuildRequires: hscolour
|
||||||
%{?ghc_pkg_c_deps:BuildRequires: %{ghc_pkg_c_deps}}
|
%{?ghc_pkg_c_deps:BuildRequires: %{ghc_pkg_c_deps}}
|
||||||
BuildRequires: gtk2hs-buildtools
|
BuildRequires: gtk2hs-buildtools
|
||||||
Patch1: ghc-glib-Gtk2HsSetup-Cabal-1.10.patch
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
%{common_description}
|
%{common_description}
|
||||||
|
@ -40,7 +39,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
|
||||||
|
@ -57,6 +55,9 @@ 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 and drop the Gtk2HsSetup patch
|
||||||
|
|
||||||
* Thu Nov 25 2010 Jens Petersen <petersen@redhat.com> - 0.11.2-4
|
* Thu Nov 25 2010 Jens Petersen <petersen@redhat.com> - 0.11.2-4
|
||||||
- obsolete ghc-gtk2hs-doc
|
- obsolete ghc-gtk2hs-doc
|
||||||
- fix build with Cabal-1.10 with ghc-glib-Gtk2HsSetup-Cabal-1.10.patch
|
- fix build with Cabal-1.10 with ghc-glib-Gtk2HsSetup-Cabal-1.10.patch
|
||||||
|
|
Loading…
Reference in New Issue