File project.diff of Package mingw32-glib2

Overview Repositories Revisions Requests Users Attributes Meta

File project.diff of Package mingw32-glib2

--- mingw32-glib2.spec.orig
+++ mingw32-glib2.spec
@@ -27,12 +27,13 @@ Source:         http://download.gnome.or
 Source1:        %{name}-rpmlintrc
 #This patch is needed by gnumeric
 #XXX: shouldn't gnumeric use g_option_context_parse_strv (added in 2.40.0)?
-Patch0:         glib-2.44.0-goption-disable-localization.patch
+#Patch0:         glib-2.44.0-goption-disable-localization.patch
 #Patch100:       0001-Add-data-based-content-type-guessing-for-win32.patch
-#Patch1001:      0001-Add-g_option_context_parse_utf8.patch
-#Patch1002:      0002-Reorder-code-to-avoid-forward-declaration.patch
-#Patch1003:      0003-Add-g_win32_get_utf8_argv.patch
-#Patch1004:      0004-Add-g_option_context_parse_command_line.patch
+Patch1000:      glib-2.30.2-wix.patch
+Patch1001:      0001-Add-g_option_context_parse_utf8.patch
+Patch1002:      0002-Reorder-code-to-avoid-forward-declaration.patch
+Patch1003:      0003-Add-g_win32_get_utf8_argv.patch
+Patch1004:      0004-Add-g_option_context_parse_command_line.patch
 
 # Native version for glib-genmarshal
 BuildRequires:  autoconf
@@ -61,6 +62,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildArch:      noarch
 
 BuildRequires:  autoconf, automake, libtool
+BuildRequires:  wixwine
 %description
 GLib provides the core application building blocks for libraries and applications written in C. It provides the core
 object system used in GNOME, the main loop implementation, and a large set of utility functions for strings and common
@@ -153,8 +155,9 @@ Development files needed for building ap
 %prep
 %setup -q -n glib-%{version}
 
-%patch0 -p1
+#%%patch0 -p1
 #%patch100 -p1
+%patch1000 -p1 -b .wix
 #%patch1001 -p1 -b .utf8
 #%patch1002 -p1 -b .reorder
 #%patch1003 -p1 -b .argv
@@ -164,7 +167,8 @@ Development files needed for building ap
 autoreconf -f -i
 echo "lt_cv_deplibs_check_method='pass_all'" >>%{_mingw32_cache}
 %{_mingw32_configure} --with-pcre=internal
-make %{?_smp_mflags} || make
+#make %{?_smp_mflags} || make
+make
 
 %install
 make %{?_smp_mflags} DESTDIR=%{buildroot} install
@@ -264,4 +268,12 @@ rm -f %{buildroot}%{_mingw32_libdir}/cha
 %{_mingw32_mandir}/man1/gtester.1*
 %{_mingw32_mandir}/man1/gdbus-codegen.1.gz
 
+%{_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

Places

File project.diff of Package mingw32-glib2

Places