File project.diff of Package mingw32-glib2

Overview Repositories Revisions Requests Users Attributes Meta

File project.diff of Package mingw32-glib2 (Revision 7d75d8ef6a4765b5e7b7c3e44d6c7560)

Currently displaying revision 7d75d8ef6a4765b5e7b7c3e44d6c7560 , Show latest

--- mingw32-glib2.spec.orig
+++ mingw32-glib2.spec
@@ -16,10 +16,12 @@ Group:          Development/Libraries
 URL:            http://www.gtk.org
 Source0:        http://download.gnome.org/sources/glib/2.26/glib-%{version}.tar.bz2
 Source1:        %{name}-rpmlintrc
-#This patch is needed by gnumeric
-Patch0:         glib-goption-disable-localization.patch
 Patch1:         glib-2.22.2-no-gdb-scripts.patch
 Patch2:         glib-2.25.15-appinfo.patch
+Patch1000:      glib-2.25.13-wix.patch
+Patch1001:      0001-Add-g_option_context_parse_utf8.patch
+Patch1002:      0002-Add-g_win32_get_utf8_argv.patch
+Patch1003:      0003-Add-g_option_context_parse_command_line.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -40,6 +42,7 @@ BuildRequires:  gettext-runtime
 # Native version required for glib-genmarshal
 BuildRequires:  glib2-devel
 Requires:       %{name}-lang = %{version}
+BuildRequires:  wixwine mingw32-glib2-bootstrap mingw32-zlib-bootstrap
 
 %description
 MinGW Windows Glib2 library.
@@ -70,9 +73,16 @@ MinGW Windows Glib2 library (development
 %prep
 %setup -q -n glib-%{version}
 
-%patch0 -p0 -b .delocalize
 %patch1 -p1 -b .no-gdb-scripts
+<<<<<<< .mine
+%patch2 -p0 -b .tml
+%patch1000 -p1 -b .wix
+%patch1001 -p1 -b .utf8
+%patch1002 -p1 -b .argv
+%patch1003 -p1 -b .commandline
+=======
 %patch2 -p1 -b .appinfo
+>>>>>>> .new
 
 
 %build
@@ -164,6 +174,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw32_mandir}/man1/gobject-query.1*
 %{_mingw32_mandir}/man1/gtester-report.1*
 %{_mingw32_mandir}/man1/gtester.1*
+%{_mingw32_datadir}/wixlib/gio-2.0.wixlib
+%{_mingw32_datadir}/wixlib/glib-2.0.wixlib
+%{_mingw32_datadir}/wixlib/gmodule-2.0.wixlib
+%{_mingw32_datadir}/wixlib/gobject-2.0.wixlib
+%{_mingw32_datadir}/wixlib/gthread-2.0.wixlib
+%{_mingw32_datadir}/wixlib/glib-2.0-lang.wixlib
+
 
 %changelog
 * Wed Sep 24 2008 Richard W.M. Jones <rjones@redhat.com> - 2.18.1-2

Places

File project.diff of Package mingw32-glib2 (Revision 7d75d8ef6a4765b5e7b7c3e44d6c7560)

Places