rpms/mono-zeroconf/F-10 mono-zeroconf-0.7.6-libdir.patch, NONE, 1.1 import.log, 1.1, 1.2 mono-zeroconf.spec, 1.6, 1.7 zeroconf-076-config.patch, 1.1, NONE

[David Nielsen]

Author: dnielsen

Update of /cvs/pkgs/rpms/mono-zeroconf/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21255/F-10

Modified Files:
	import.log mono-zeroconf.spec 
Added Files:
	mono-zeroconf-0.7.6-libdir.patch 
Removed Files:
	zeroconf-076-config.patch 
Log Message:
Fix libdir patch
Remove unmaintainable sed magic
Rebuild for #487155 


mono-zeroconf-0.7.6-libdir.patch:

--- NEW FILE mono-zeroconf-0.7.6-libdir.patch ---
# Fix libdir
diff -uraN mono-zeroconf-0.7.6.orig/configure mono-zeroconf-0.7.6/configure
--- mono-zeroconf-0.7.6.orig/configure	2009-03-02 12:30:24.573870303 +0100
+++ mono-zeroconf-0.7.6/configure	2009-03-02 12:32:34.966899234 +0100
@@ -3100,8 +3100,8 @@
    { (exit 1); exit 1; }; }
 fi
 
-GACUTIL_FLAGS='-package $(PACKAGE) -root $(DESTDIR)$(prefix)/lib'
-GACUTIL_POLICY_FLAGS='-root $(DESTDIR)$(prefix)/lib'
+GACUTIL_FLAGS='-package $(PACKAGE) -root $(DESTDIR)$(libdir)'
+GACUTIL_POLICY_FLAGS='-root $(DESTDIR)$(libdir)'
 
 
 
diff -uraN mono-zeroconf-0.7.6.orig/configure.ac mono-zeroconf-0.7.6/configure.ac
--- mono-zeroconf-0.7.6.orig/configure.ac	2009-03-02 12:30:24.569870285 +0100
+++ mono-zeroconf-0.7.6/configure.ac	2009-03-02 12:31:45.105899220 +0100
@@ -33,8 +33,8 @@
 	AC_MSG_ERROR([You need to install al])
 fi
 
-GACUTIL_FLAGS='-package $(PACKAGE) -root $(DESTDIR)$(prefix)/lib'
-GACUTIL_POLICY_FLAGS='-root $(DESTDIR)$(prefix)/lib'
+GACUTIL_FLAGS='-package $(PACKAGE) -root $(DESTDIR)$(libdir)'
+GACUTIL_POLICY_FLAGS='-root $(DESTDIR)$(libdir)'
 AC_SUBST(GACUTIL_FLAGS)
 AC_SUBST(GACUTIL_POLICY_FLAGS)
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mono-zeroconf/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	26 Aug 2008 17:41:05 -0000	1.1
+++ import.log	2 Mar 2009 11:47:24 -0000	1.2
@@ -1 +1,2 @@
 mono-zeroconf-0_7_6-3_fc10:HEAD:mono-zeroconf-0.7.6-3.fc10.src.rpm:1219772405
+mono-zeroconf-0_7_6-4_fc10:F-10:mono-zeroconf-0.7.6-4.fc10.src.rpm:1235994369


Index: mono-zeroconf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-zeroconf/F-10/mono-zeroconf.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mono-zeroconf.spec	26 Aug 2008 17:41:05 -0000	1.6
+++ mono-zeroconf.spec	2 Mar 2009 11:47:24 -0000	1.7
@@ -2,13 +2,13 @@
 
 Name:           mono-zeroconf
 Version:        0.7.6
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Mono-zeroconf namespace
 Group:          Development/Languages
 License:        MIT
 URL:            http://banshee-project.org/files/mono-zeroconf
 Source0:        %{name}-%{version}.tar.bz2
-Patch0:		zeroconf-076-config.patch
+Patch0:         mono-zeroconf-0.7.6-libdir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  mono-devel, avahi-sharp, monodoc-devel
 Requires: monodoc
@@ -29,10 +29,7 @@
 
 %prep
 %setup -q
-# sed magic...
-sed -i -e 's!@libdir@!%{_libdir}!' %{PATCH0}
-%patch0 -p1 -b .original
-sed -i -e 's!%{_libdir}!@libdir@!' %{PATCH0} 
+%patch0 -p1 -b .patch
 
 %build
 %configure
@@ -60,6 +57,10 @@
 %{_libdir}/pkgconfig/mono-zeroconf.pc
 
 %changelog
+* Mon Mar 02 2009 David Nielsen <dnielsen at fedoraproject.org> - 0.7.6-4
+- Rebuild for #487155
+- Update libdir fixes
+
 * Sun Aug 17 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.7.6-3
 - added autoreconf
 


--- zeroconf-076-config.patch DELETED ---