Fix a c++ issue
This commit is contained in:
parent
e237e22350
commit
18e9102e66
@ -1,13 +1,15 @@
|
|||||||
Summary: A library of handy utility functions.
|
Summary: A library of handy utility functions.
|
||||||
Name: glib2
|
Name: glib2
|
||||||
Version: 2.6.3
|
Version: 2.6.3
|
||||||
Release: 3
|
Release: 4
|
||||||
License: LGPL
|
License: LGPL
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
Source: glib-%{version}.tar.bz2
|
Source: glib-%{version}.tar.bz2
|
||||||
Source2: glib2.sh
|
Source2: glib2.sh
|
||||||
Source3: glib2.csh
|
Source3: glib2.csh
|
||||||
Patch0: glib-2.6.3-gcc4.patch
|
Patch0: glib-2.6.3-gcc4.patch
|
||||||
|
# upstream in 2.6.4
|
||||||
|
Patch1: glib-2.6.3-c++.patch
|
||||||
Conflicts: libgnomeui <= 2.2.0
|
Conflicts: libgnomeui <= 2.2.0
|
||||||
BuildRoot: %{_tmppath}/glib-%{PACKAGE_VERSION}-root
|
BuildRoot: %{_tmppath}/glib-%{PACKAGE_VERSION}-root
|
||||||
BuildRequires: pkgconfig >= 0.8
|
BuildRequires: pkgconfig >= 0.8
|
||||||
@ -38,6 +40,7 @@ version 2 of the GLib library.
|
|||||||
%prep
|
%prep
|
||||||
%setup -q -n glib-%{version}
|
%setup -q -n glib-%{version}
|
||||||
%patch0 -p1 -b .gcc4
|
%patch0 -p1 -b .gcc4
|
||||||
|
%patch1 -p1 -b .c++
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
|
||||||
@ -100,6 +103,9 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%{_mandir}/man1/*
|
%{_mandir}/man1/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Mar 11 2005 Matthias Clasen <mclasen@redhat.com> - 2.6.3-4
|
||||||
|
- Fix #150817
|
||||||
|
|
||||||
* Wed Mar 4 2005 Matthias Clasen <mclasen@redhat.com> - 2.6.3-3
|
* Wed Mar 4 2005 Matthias Clasen <mclasen@redhat.com> - 2.6.3-3
|
||||||
- Rebuild
|
- Rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user