File project.diff of Package mingw32-libgsf

Overview Repositories Revisions Requests Users Attributes Meta

File project.diff of Package mingw32-libgsf (Revision 334742dfd24ecb9eb438eb06ca7c0272)

Currently displaying revision 334742dfd24ecb9eb438eb06ca7c0272 , Show latest

--- mingw32-libgsf.spec.orig
+++ mingw32-libgsf.spec
@@ -14,6 +14,7 @@ Summary:        Library for reading and
 License:        GPL v2 or later; LGPL v2.1 or later
 Url:            http://www.gnome.org/
 Source0:        ftp://ftp.gnome.org/pub/gnome/sources/libgsf/1.14/libgsf-%{version}.tar.bz2
+Patch1000:      libgsf-1.14.16-wix.patch
 Group:          Development/Libraries
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -31,6 +32,8 @@ BuildRequires:  mingw32-gettext-tools
 BuildRequires:  mingw32-zlib-devel
 BuildRequires:  intltool
 BuildRequires:  gconf2-devel
+BuildRequires:  autoconf automake libtool
+BuildRequires:  wixwine
 Requires:       %{name}-lang = %{version}
 
 
@@ -50,35 +53,21 @@ Requires:       mingw32-zlib-devel
 MinGW Windows port of the library for reading and writing structured files (development files).
 
 
-<<<<<<< .mine
-=======
-%package gnome
-Summary:        Library for reading and writing structured files (gnome support)
-Group:          Development/Libraries
-
-%description gnome
-MinGW Windows port of the library for reading and writing structured files (gnome support).
-
-
->>>>>>> .new
 %{_mingw32_debug_package}
 
 %lang_package
 
 %prep
 %setup -q -n libgsf-%{version}
+%patch1000 -p1 -b .wix
 
 %build
+autoreconf -f -i
 echo "lt_cv_deplibs_check_method='pass_all'" >>%{_mingw32_cache}
 %{_mingw32_configure} \
-<<<<<<< .mine
-	--enable-shared --disable-static \
-	--without-python \
-	--disable-schemas-install
-=======
+	--disable-schemas-install \
 	--without-python \
 	--enable-shared --disable-static
->>>>>>> .new
 %{_mingw32_make} %{?_smp_mflags} || %{_mingw32_make}
 
 
@@ -117,6 +106,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw32_datadir}/gtk-doc/html/gsf
 %{_mingw32_includedir}/libgsf-1/gsf
 %{_mingw32_includedir}/libgsf-1/gsf-win32
+%{_mingw32_datadir}/wixlib/libgsf.wixlib
 
 
 %changelog

Places

File project.diff of Package mingw32-libgsf (Revision 334742dfd24ecb9eb438eb06ca7c0272)

Places