rpms/gtksourceview-sharp/devel gtksourceview-sharp-libdir.patch, 1.2, 1.3 gtksourceview-sharp.spec, 1.4, 1.5
Paul F. Johnson (pfj)
fedora-extras-commits at redhat.com
Thu Aug 24 21:28:09 UTC 2006
Author: pfj
Update of /cvs/extras/rpms/gtksourceview-sharp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17499/devel
Modified Files:
gtksourceview-sharp.spec
Added Files:
gtksourceview-sharp-libdir.patch
Log Message:
auto-import gtksourceview-sharp-2.0-17 on branch devel from gtksourceview-sharp-2.0-17.src.rpm
gtksourceview-sharp-libdir.patch:
Index: gtksourceview-sharp-libdir.patch
===================================================================
RCS file: gtksourceview-sharp-libdir.patch
diff -N gtksourceview-sharp-libdir.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ gtksourceview-sharp-libdir.patch 24 Aug 2006 21:28:09 -0000 1.3
@@ -0,0 +1,29 @@
+--- gtksourceview-sharp-2.0-0.10/Makefile.am 2006-07-08 19:30:12.000000000 -0500
++++ gtksourceview-sharp-2.0-0.10/Makefile.am 2006-07-08 19:32:18.000000000 -0500
+@@ -6,6 +6,6 @@
+ extra_langdir= $(gtksourceview_prefix)/share/gtksourceview-1.0/language-specs
+ extra_lang_DATA= nemerle.lang vbnet.lang
+
+-pkgconfigdir = $(prefix)/lib/pkgconfig
++pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = gtksourceview-sharp-2.0.pc
+
+--- gtksourceview-sharp-2.0-0.10/configure.in 2006-07-08 19:38:48.000000000 -0500
++++ gtksourceview-sharp-2.0-0.10/configure.in 2006-07-08 19:39:08.000000000 -0500
+@@ -54,7 +54,7 @@
+ AC_MSG_ERROR([No gacutil tool found])
+ fi
+
+-GACUTIL_FLAGS='/package gtksourceview-sharp-2.0 /root $(DESTDIR)$(prefix)/lib'
++GACUTIL_FLAGS='/package gtksourceview-sharp-2.0 /root $(DESTDIR)$(libdir)'
+
+ AC_SUBST(RUNTIME)
+ AC_SUBST(CSC)
+--- gtksourceview-sharp-2.0-0.10/gtksourceview-sharp-2.0.pc.in 2005-04-26 11:49:22.000000000 -0500
++++ gtksourceview-sharp-2.0-0.10/gtksourceview-sharp-2.0.pc.in 2006-07-08 22:13:20.000000000 -0500
+@@ -7,4 +7,4 @@
+ Description: GtkSourceView# - gtksourceview .NET Binding
+ Version: @VERSION@
+ Requires: gnome-sharp-2.0
+-Libs: -r:${prefix}/lib/mono/gtksourceview-sharp-2.0/gtksourceview-sharp.dll
++Libs: -r:@libdir@/mono/gtksourceview-sharp-2.0/gtksourceview-sharp.dll
Index: gtksourceview-sharp.spec
===================================================================
RCS file: /cvs/extras/rpms/gtksourceview-sharp/devel/gtksourceview-sharp.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gtksourceview-sharp.spec 22 Aug 2006 08:55:13 -0000 1.4
+++ gtksourceview-sharp.spec 24 Aug 2006 21:28:09 -0000 1.5
@@ -3,13 +3,14 @@
Summary: A C sharp binder for gtksourceview
Name: gtksourceview-sharp
Version: 2.0
-Release: 16%{?dist}
+Release: 17%{?dist}
License: LGPL
Group: System Environment/Libraries
Source0: http://go-mono.com/sources-latest/%{name}-%{version}/%{name}-%{version}-%{extra}.tar.gz
+Patch0: gtksourceview-sharp-libdir.patch
URL: http://go-mono.com/sources-latest/%{name}-%{version}/
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: mono-data, mono-devel, gtk-sharp2, gtksourceview-devel, gtk-sharp2-gapi, gecko-sharp2, pkgconfig gnome-sharp-devel gtk-sharp2-devel
+BuildRequires: mono-data, mono-devel, gtk-sharp2, gtksourceview-devel, gtk-sharp2-gapi, gecko-sharp2, pkgconfig gnome-sharp-devel gtk-sharp2-devel autoconf
Requires: mono-core, gtksourceview
%description
@@ -26,16 +27,16 @@
%prep
rm -rf %
%setup -q -n %{name}-%{version}-%{extra}
+%patch0 -p1
+autoreconf
%build
-export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
-%configure
+%configure --libdir=%{_libdir}
make all %{?_smp_mflags}
%install
%{__rm} -rf %{buildroot}
-export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
-make DESTDIR=%{buildroot} install
+make DESTDIR=%{buildroot} LIBDIR=%{_libdir} install
rm -f %{buildroot}%{_datadir}/gtksourceview-1.0/language-specs/vbnet.lang
%files
@@ -54,10 +55,11 @@
%{__rm} -rf %{buildroot}
%changelog
-* Sat Aug 19 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 2.0-0.10-16
+* Sat Aug 24 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 2.0-0.10-17
- rebuild
- removed 64 bit hacks
- removed unused BRs
+- Added back the libdir patch and added autoreconf
* Tue Aug 01 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 2.0-0.10-15
- fixes directory ownership error in spec file
More information about the fedora-extras-commits
mailing list