Author: benm
Date: 2005-04-27 19:20:34 -0400 (Wed, 27 Apr 2005)
New Revision: 43696

Modified:
   trunk/release/conf/gtk-sharp-2.0/ximian-build.conf
   trunk/release/conf/gtk-sharp/ximian-build.conf
Log:
updates

Modified: trunk/release/conf/gtk-sharp/ximian-build.conf
===================================================================
--- trunk/release/conf/gtk-sharp/ximian-build.conf      2005-04-27 23:20:18 UTC 
(rev 43695)
+++ trunk/release/conf/gtk-sharp/ximian-build.conf      2005-04-27 23:20:34 UTC 
(rev 43696)
@@ -51,7 +51,7 @@
     <build id="default">
       <prepare>autoconf; [[usrconfigure]]</prepare>
       <compile>${MAKE}</compile>
-      <install>${MAKE} install DESTDIR=${DESTDIR} GACUTIL_FLAGS="/package 
gtk-sharp /root ${DESTDIR}/usr/lib"</install>
+      <install>${MAKE} install DESTDIR=${DESTDIR}</install>
 
       <builddep id="buildrequires">
         <l>default build deps</l>
@@ -67,12 +67,7 @@
         <psdata id="group">Development/Libraries</psdata>
 
         <files>
-         <i>[[usrprefix]]/lib/libgdksharpglue.so</i>
-         <i>[[usrprefix]]/lib/libgladesharpglue.so</i>
-         <i>[[usrprefix]]/lib/libglibsharpglue.so</i>
-         <i>[[usrprefix]]/lib/libgnomesharpglue.so</i>
-         <i>[[usrprefix]]/lib/libgtksharpglue.so</i>
-         <i>[[usrprefix]]/lib/libpangosharpglue.so</i>          
+         <i>[[usrlibdir]]/*.so</i>         
          <i>[[usrprefix]]/bin/gconfsharp-schemagen.exe</i>
          <i>[[usrprefix]]/bin/gconfsharp-schemagen</i>
          <i>[[usrprefix]]/lib/mono/gac/art-sharp/*</i>
@@ -84,10 +79,10 @@
          <i>[[usrprefix]]/lib/mono/gac/glib-sharp/*</i>
          <i>[[usrprefix]]/lib/mono/gac/gnome-sharp/*</i>
          <i>[[usrprefix]]/lib/mono/gac/gtk-sharp/*</i>
-         <!-- <i>[[usrprefix]]/lib/mono/gac/gtkhtml-sharp/*</i> -->
          <i>[[usrprefix]]/lib/mono/gac/pango-sharp/*</i>
          <i>[[usrprefix]]/lib/mono/gac/rsvg-sharp/*</i>
          <i>[[usrprefix]]/lib/mono/gac/vte-sharp/*</i>
+         <i>[[usrprefix]]/lib/mono/gac/gtkhtml-sharp/*</i>
          <i>[[usrprefix]]/lib/mono/gtk-sharp/art-sharp.dll</i>
          <i>[[usrprefix]]/lib/mono/gtk-sharp/atk-sharp.dll</i>
          <i>[[usrprefix]]/lib/mono/gtk-sharp/gconf-sharp-peditors.dll</i>
@@ -97,13 +92,11 @@
          <i>[[usrprefix]]/lib/mono/gtk-sharp/glib-sharp.dll</i>
          <i>[[usrprefix]]/lib/mono/gtk-sharp/gnome-sharp.dll</i>
          <i>[[usrprefix]]/lib/mono/gtk-sharp/gtk-sharp.dll</i>
-         <!-- <i>[[usrprefix]]/lib/mono/gtk-sharp/gtkhtml-sharp.dll</i> -->
          <i>[[usrprefix]]/lib/mono/gtk-sharp/pango-sharp.dll</i>
          <i>[[usrprefix]]/lib/mono/gtk-sharp/rsvg-sharp.dll</i>
          <i>[[usrprefix]]/lib/mono/gtk-sharp/vte-sharp.dll</i>
-         <i>[[usrprefix]]/lib/pkgconfig/*.pc</i>
-         <i>[[usrprefix]]/lib/mono/gac/gtkhtml-sharp/*</i>
          <i>[[usrprefix]]/lib/mono/gtk-sharp/gtkhtml-sharp.dll</i>
+         <i>[[usrlibdir]]/pkgconfig/*.pc</i>
         </files>
 
         <dep id="requires">
@@ -174,7 +167,7 @@
           <i>[[usrprefix]]/bin/gapi_codegen.exe</i>
           <i>[[usrprefix]]/bin/gapi_format_xml</i>
           <i>[[usrprefix]]/bin/gapi_pp.pl</i>
-          <i>[[usrprefix]]/lib/pkgconfig/gapi.pc</i>
+          <i>[[usrlibdir]]/pkgconfig/gapi.pc</i>
           <i>[[usrprefix]]/share/gapi/*.xml</i>
           <!-- <i>[[usrprefix]]/share/perl5/GAPI/Metadata.pm</i> -->
         </files>

Modified: trunk/release/conf/gtk-sharp-2.0/ximian-build.conf
===================================================================
--- trunk/release/conf/gtk-sharp-2.0/ximian-build.conf  2005-04-27 23:20:18 UTC 
(rev 43695)
+++ trunk/release/conf/gtk-sharp-2.0/ximian-build.conf  2005-04-27 23:20:34 UTC 
(rev 43696)
@@ -19,6 +19,7 @@
       <i>pkgconfig</i>
       <i>vte-devel</i>
       <i>gnome-panel-devel</i>
+      <i>libjpeg-devel</i>
     </list>
  
     <list id="SuSE build deps">
@@ -57,7 +58,7 @@
     <build id="default">
       <prepare>[[usrconfigure]]</prepare>
       <compile>${MAKE}</compile>
-      <install>${MAKE} install DESTDIR=${DESTDIR} GACUTIL_FLAGS="/package 
gtk-sharp-2.0 /root ${DESTDIR}/usr/lib"</install>
+      <install>${MAKE} install DESTDIR=${DESTDIR}</install>
  
       <builddep id="buildrequires">
         <l>default build deps</l>
@@ -73,23 +74,23 @@
         <psdata id="group">Development/Libraries</psdata>
  
         <files>
-          <i>[[usrprefix]]/lib/*.so</i>
+          <i>[[usrlibdir]]/*.so</i>
           <i>[[usrprefix]]/lib/gtk-sharp-2.0/gconfsharp-schemagen.exe</i>
           <i>[[usrprefix]]/bin/gconfsharp2-schemagen</i>
           <i>[[usrprefix]]/lib/mono/gac/*/*</i>
           <i>[[usrprefix]]/lib/mono/gtk-sharp-2.0</i>
-          <i>[[usrprefix]]/lib/pkgconfig/glade-sharp-2.0.pc</i>
-          <i>[[usrprefix]]/lib/pkgconfig/art-sharp-2.0.pc</i>
-          <i>[[usrprefix]]/lib/pkgconfig/gnome-vfs-sharp-2.0.pc</i>
-          <i>[[usrprefix]]/lib/pkgconfig/gnome-sharp-2.0.pc</i>
-          <i>[[usrprefix]]/lib/pkgconfig/gtkhtml-sharp-2.0.pc</i>
-          <i>[[usrprefix]]/lib/pkgconfig/gconf-sharp-2.0.pc</i>
-          <i>[[usrprefix]]/lib/pkgconfig/rsvg-sharp-2.0.pc</i>
-          <i>[[usrprefix]]/lib/pkgconfig/vte-sharp-2.0.pc</i>
-          <i>[[usrprefix]]/lib/pkgconfig/gtk-sharp-2.0.pc</i>
-          <i>[[usrprefix]]/lib/pkgconfig/gda-sharp-2.0.pc</i>
-          <i>[[usrprefix]]/lib/pkgconfig/gnomedb-sharp-2.0.pc</i>
-          <i>[[usrprefix]]/lib/pkgconfig/gtk-dotnet-2.0.pc</i>
+          <i>[[usrlibdir]]/pkgconfig/glade-sharp-2.0.pc</i>
+          <i>[[usrlibdir]]/pkgconfig/art-sharp-2.0.pc</i>
+          <i>[[usrlibdir]]/pkgconfig/gnome-vfs-sharp-2.0.pc</i>
+          <i>[[usrlibdir]]/pkgconfig/gnome-sharp-2.0.pc</i>
+          <i>[[usrlibdir]]/pkgconfig/gtkhtml-sharp-2.0.pc</i>
+          <i>[[usrlibdir]]/pkgconfig/gconf-sharp-2.0.pc</i>
+          <i>[[usrlibdir]]/pkgconfig/rsvg-sharp-2.0.pc</i>
+          <i>[[usrlibdir]]/pkgconfig/vte-sharp-2.0.pc</i>
+          <i>[[usrlibdir]]/pkgconfig/gtk-sharp-2.0.pc</i>
+          <i>[[usrlibdir]]/pkgconfig/gda-sharp-2.0.pc</i>
+          <i>[[usrlibdir]]/pkgconfig/gnomedb-sharp-2.0.pc</i>
+          <i>[[usrlibdir]]/pkgconfig/gtk-dotnet-2.0.pc</i>
         </files>
  
         <dep id="requires">
@@ -160,7 +161,7 @@
           <i>[[usrprefix]]/lib/gtk-sharp-2.0/gapi_parser.pl</i>
           <i>[[usrprefix]]/lib/gtk-sharp-2.0/gapi_pp.pl</i>
           <i>[[usrprefix]]/lib/gtk-sharp-2.0/gapi2xml.pl</i>
-          <i>[[usrprefix]]/lib/pkgconfig/gapi-2.0.pc</i>
+          <i>[[usrlibdir]]/pkgconfig/gapi-2.0.pc</i>
           <i>[[usrprefix]]/share/gapi*/*.xml</i>
         </files>
  

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to