rpms/gnome-libs/devel gnome-libs-1.4.2-multiarch.patch, NONE, 1.1 gnome-libs.spec, 1.3, 1.4

[Paul Howarth (pghmcfc)]

Author: pghmcfc

Update of /cvs/pkgs/rpms/gnome-libs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20757

Modified Files:
	gnome-libs.spec 
Added Files:
	gnome-libs-1.4.2-multiarch.patch 
Log Message:
- Clarify licensing (db 1.85 is BSD with advertising, and many objects link to it)
- Don't manually install files in %install that aren't going to be packaged
- Preserve timestamps of files copied directly from source to installed package
- Encode ChangeLog as UTF-8
- Fix multiarch conflicts in %{_bindir}/gnome-config, %{_bindir}/libart-config, and
  %{_includedir}/gnome-1.0/libart_lgpl/art_config.h (#341321)


gnome-libs-1.4.2-multiarch.patch:

--- NEW FILE gnome-libs-1.4.2-multiarch.patch ---
--- gnome-libs-1.4.2/libart_lgpl/gen_art_config.c	2002-01-10 22:31:18.000000000 +0000
+++ gnome-libs-1.4.2/libart_lgpl/gen_art_config.c	2007-10-24 17:46:51.000000000 +0100
@@ -24,12 +24,12 @@
 {
   printf ("/* Automatically generated by gen_art_config.c */\n"
 	  "\n"
-	  "#define ART_SIZEOF_CHAR %d\n"
-	  "#define ART_SIZEOF_SHORT %d\n"
-	  "#define ART_SIZEOF_INT %d\n"
-	  "#define ART_SIZEOF_LONG %d\n"
+	  "#define ART_SIZEOF_CHAR %s\n"
+	  "#define ART_SIZEOF_SHORT %s\n"
+	  "#define ART_SIZEOF_INT %s\n"
+	  "#define ART_SIZEOF_LONG %s\n"
 	  "\n",
-	  sizeof(char), sizeof(short), sizeof(int), sizeof(long));
+	  "sizeof(char)", "sizeof(short)", "sizeof(int)", "sizeof(long)");
 
   if (sizeof(char) == 1)
     printf ("typedef unsigned char art_u8;\n");
--- gnome-libs-1.4.2/gnome-config.in	2001-03-05 22:17:43.000000000 +0000
+++ gnome-libs-1.4.2/gnome-config.in	2007-10-25 10:22:47.000000000 +0100
@@ -10,7 +10,7 @@
 sysconfdir=@sysconfdir@
 sharedstatedir=@sharedstatedir@
 localstatedir=@localstatedir@
-libdir=@libdir@
+libdir=`pkg-config --variable=libdir glib`
 infodir=@infodir@
 mandir=@mandir@
 includedir=@includedir@
@@ -173,19 +173,19 @@
 	the_flags="$the_flags `gtk-config --cflags`"
 	;;
     gnome)
-       	the_libs="$the_libs @GNOME_LIBDIR@ @GNOME_LIBS@"
-  	the_flags="$the_flags @GNOME_INCLUDEDIR@ @GTK_CFLAGS@"
+       	the_libs="$the_libs @GNOME_LIBDIR@ -lgnome -lgnomesupport `esd-config --libs` `audiofile-config --libs` `glib-config --libs`"
+  	the_flags="$the_flags @GNOME_INCLUDEDIR@ `gtk-config --cflags`"
 	;;
     gnomeui)
-	the_libs="$the_libs @GNOME_LIBDIR@ @GNOMEUI_LIBS@"
-	the_flags="$the_flags @GNOME_INCLUDEDIR@ @GTK_CFLAGS@"
+	the_libs="$the_libs @GNOME_LIBDIR@ -lgnomeui -lart_lgpl `imlib-config --libs-gdk` -lSM -lICE `gtk-config --libs` -lgnome -lgnomesupport `esd-config --libs` `audiofile-config --libs` `glib-config --libs`"
+	the_flags="$the_flags @GNOME_INCLUDEDIR@ `gtk-config --cflags`"
 	;;
     gtkxmhtml)
-	the_libs="$the_libs @GNOME_LIBDIR@ @GTKXMHTML_LIBS@"
+	the_libs="$the_libs @GNOME_LIBDIR@ -lgtkxmhtml -lXpm -ljpeg -lpng10 -lz -lSM -lICE `gtk-config --libs`"
 	;;
     gnorba)
-        the_libs="$the_libs @GNOME_LIBDIR@ -lgnorba @ORBIT_LIBS@"
-	the_flags="$the_flags @GNOME_INCLUDEDIR@ @ORBIT_CFLAGS@"
+        the_libs="$the_libs @GNOME_LIBDIR@ -lgnorba `orbit-config --use-service=name --libs client server`"
+	the_flags="$the_flags @GNOME_INCLUDEDIR@ `orbit-config --cflags client server`"
         ;;
     idl)
 	the_flags="-I${datadir}/idl"
@@ -194,7 +194,7 @@
 	done
 	;;
     zvt)
-	the_libs="$the_libs @GNOME_LIBDIR@ @ZVT_LIBS@ @GDK_IMLIB_LIBS@"
+	the_libs="$the_libs @GNOME_LIBDIR@ -lzvt -lutil -lSM -lICE `gtk-config --libs` `imlib-config --libs-gdk`"
 	;;
     libgtop)
 	the_libs="$the_libs `libgtop-config --libs --extra-libs`"
--- gnome-libs-1.4.2/libart_lgpl/libart-config.in	2001-09-24 21:18:09.000000000 +0100
+++ gnome-libs-1.4.2/libart_lgpl/libart-config.in	2007-10-25 09:02:08.000000000 +0100
@@ -4,7 +4,7 @@
 exec_prefix=@exec_prefix@
 exec_prefix_set=no
 includedir=@includedir@
-libdir=@libdir@
+libdir=`pkg-config --variable=libdir glib`
 
 usage="\
 Usage: libart-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags]"


Index: gnome-libs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-libs/devel/gnome-libs.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnome-libs.spec	9 Mar 2007 13:39:47 -0000	1.3
+++ gnome-libs.spec	25 Oct 2007 10:04:17 -0000	1.4
@@ -5,9 +5,9 @@
 Name:           gnome-libs
 Epoch:          1
 Version:        1.4.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        The main GNOME1 libraries
-License:        LGPL
+License:        LGPLv2+ and BSD with advertising and (LGPLv2+ and BSD with advertising)
 Group:          System Environment/Libraries
 URL:            http://www.gnome.org/
 # "Upstream" for Source2 and Source4 appears to be Fedora CVS
@@ -57,7 +57,7 @@
 Patch52:        gnome-libs-1.4.1.2.90-htmlview.patch
 Patch53:        gnome-libs-1.4.1.2.90-remove-duplicate-definition.patch
 
-## db1 patches
+# db1 patches
 Patch80:        db.1.85.patch
 Patch81:        db.1.85.s390.patch
 Patch82:        db.1.85.nodebug.patch
@@ -65,6 +65,7 @@
 # Fedora patches
 Patch100:       gnome-libs-1.4.2-multilib.patch
 Patch101:       gnome-libs-1.4.2-dateedit-fix1.patch
+Patch102:       gnome-libs-1.4.2-multiarch.patch
 
 %description
 GNOME (GNU Network Object Model Environment) is a user-friendly set of GUI
@@ -75,12 +76,14 @@
 %package devel
 Summary:        Libraries and headers for GNOME 1 application development
 Group:          Development/Libraries
+License:        LGPLv2+ and (LGPLv2+ and BSD with advertising)
 Requires:       %{name} = %{epoch}:%{version}-%{release}
 Requires:       gtk+-devel
 Requires:       ORBit-devel
 Requires:       imlib-devel
 Requires:       esound-devel
 Requires:       libSM-devel
+Requires:       pkgconfig
 
 # For ownership of %{_datadir}/aclocal
 Requires:       automake
@@ -126,10 +129,14 @@
 
 %patch100 -p1 -b .multilib
 %patch101 -p1 -b .dateedit-fix1
+%patch102 -p1 -b .multiarch
+
+/usr/bin/iconv -f iso-8859-1 -t utf-8 < ChangeLog > ChangeLog.utf-8
+%{__mv} -f ChangeLog.utf-8 ChangeLog
 
 %build
 
-## db1
+# db1
 pushd %{dbdir}
 %{__gzip} -9 docs/*.ps
 (cd include && %{__ln_s} -f db.h db_185.h)
@@ -164,26 +171,21 @@
 %install
 %{__rm} -rf %{buildroot}
 
-## db1
+# db1
 pushd %{dbdir}
 %{__mkdir_p} %{buildroot}{%{_includedir}/db1,%{_bindir},%{_libdir}}
 %{__sed} -n '/^\/\*-/,/^ \*\//s/^.\*.\?//p' include/db.h | %{__grep} -v '^@.*db\.h' > LICENSE
 %{__perl} -pi -e 's/<db.h>/<db1\/db.h>/' PORT/include/ndbm.h
 cd PORT/linux
 sover=$(echo libdb.so.* | %{__sed} 's/libdb.so.//')
-%{__install} -m644 libdb.a                %{buildroot}/%{_libdir}/libdb1.a
 %{__install} -m755 libdb.so.${sover}      %{buildroot}/%{_libdir}/libdb1.so.${sover}
-%{__ln_s} -f libdb1.so.${sover}           %{buildroot}/%{_libdir}/libdb1.so
 %{__ln_s} -f libdb1.so.${sover}           %{buildroot}/%{_libdir}/libdb.so.${sover}
-%{__install} -m644 ../include/ndbm.h      %{buildroot}/%{_includedir}/db1/
-%{__install} -m644 ../../include/db.h     %{buildroot}/%{_includedir}/db1/
-%{__install} -m644 ../../include/mpool.h  %{buildroot}/%{_includedir}/db1/
 %{__install} -s -m755 db_dump185          %{buildroot}/%{_bindir}/db1_dump185
 popd
 
 SAVE_LLP=${LD_LIBRARY_PATH}
 export LD_LIBRARY_PATH=%{_builddir}/%{name}-%{version}/%{dbdir}/PORT/linux:${SAVE_LLP}
-%{__make} DESTDIR=%{buildroot} install
+%{__make} DESTDIR=%{buildroot} install INSTALL="%{__install} -p"
 export LD_LIBRARY_PATH=${SAVE_LLP}
 
 %{__mkdir_p}   %{buildroot}%{_datadir}/emacs/site-lisp
@@ -206,9 +208,7 @@
             %{buildroot}%{_datadir}/gtk-doc/html/libart \
             %{buildroot}%{_datadir}/type-convert/gnome-make-postscript-mimes \
             %{buildroot}%{_datadir}/type-convert/postscript.convert \
-            %{buildroot}%{_libdir}/libdb1.{a,so} \
-            %{buildroot}%{_libdir}/lib{art_lgpl,gnome,gnomesupport,gnomeui,gnorba,gnorbagtk,gtkxmhtml,zvt}.a \
-            %{buildroot}%{_includedir}/db1
+            %{buildroot}%{_libdir}/lib{art_lgpl,gnome,gnomesupport,gnomeui,gnorba,gnorbagtk,gtkxmhtml,zvt}.a
 
 %find_lang %{name}
 
@@ -220,25 +220,22 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING COPYING.LIB ChangeLog NEWS README %{dbdir}/LICENSE %{dbdir}/changelog
-%{_bindir}/db1_dump185
+# Files licensed LGPLv2+
+%doc AUTHORS COPYING COPYING.LIB ChangeLog NEWS README
 %{_bindir}/dns-helper
-%{_bindir}/gconfigger
 %{_bindir}/gnome-bug
-%{_bindir}/gnome-dump-metadata
-%{_bindir}/gnome-gen-mimedb
-%{_bindir}/gnome-moz-remote
 %{_bindir}/gnome-name-service
-%{_bindir}/gnome_segv
-%{_bindir}/goad-browser
-%{_bindir}/loadshlib
-%{_bindir}/new-object
 %attr(2755,root,utmp) %{_prefix}/sbin/gnome-pty-helper
+%{_libdir}/libart_lgpl.so.*
+%{_libdir}/libgnomesupport.so.*
+%{_libdir}/libgnorbagtk.so.*
+%{_libdir}/libgnorba.so.*
+%{_libdir}/libgtkxmhtml.so.*
+%{_libdir}/libzvt.so.*
 %{_datadir}/idl/*
 %{_datadir}/pixmaps/*
 %{_datadir}/mime-info/gnome.mime
 %{_datadir}/type-convert
-%{_libdir}/lib*.so.*
 %dir %{_sysconfdir}/gnome/
 %dir %{_sysconfdir}/sound/
 %dir %{_sysconfdir}/sound/events/
@@ -247,22 +244,56 @@
 %config %{_sysconfdir}/mime-magic.dat
 %config %{_sysconfdir}/paper.config
 %config %{_sysconfdir}/sound/events/*.soundlist
+# Files licensed BSD with advertising
+%doc %{dbdir}/LICENSE %{dbdir}/changelog
+%{_bindir}/db1_dump185
+%{_libdir}/libdb*.so.*
+# Files licensed (LGPLv2+ and BSD with advertising)
+%{_bindir}/gconfigger
+%{_bindir}/gnome-dump-metadata
+%{_bindir}/gnome-gen-mimedb
+%{_bindir}/gnome-moz-remote
+%{_bindir}/gnome_segv
+%{_bindir}/goad-browser
+%{_bindir}/loadshlib
+%{_bindir}/new-object
+%{_libdir}/libgnome.so.*
+%{_libdir}/libgnomeui.so.*
 
 %files devel
 %defattr(-,root,root,-)
+# Files licensed LGPLv2+
 %{_bindir}/gnome-config
 %{_bindir}/libart-config
 %{_bindir}/gnome-doc
 %{_bindir}/mkstub
-%{_libdir}/lib*.so
+%{_libdir}/libart_lgpl.so
+%{_libdir}/libgnomesupport.so
+%{_libdir}/libgnorbagtk.so
+%{_libdir}/libgnorba.so
+%{_libdir}/libgtkxmhtml.so
+%{_libdir}/libzvt.so
 %{_libdir}/*.sh
 %{_libdir}/gnome-libs/
-%{_includedir}/*
-%{_datadir}/aclocal/*
+%{_includedir}/gnome-1.0/
+%{_datadir}/aclocal/libart.m4
 %{_datadir}/gnome/html/
 %{_datadir}/emacs/site-lisp/gnome-doc.el
+# Files licensed (LGPLv2+ and BSD with advertising)
+%{_libdir}/libgnome.so
+%{_libdir}/libgnomeui.so
 
 %changelog
+* Tue Oct 24 2007 Paul Howarth <paul at city-fan.org> 1:1.4.2-6
+- Clarify licensing (db 1.85 is BSD with advertising, and many objects link
+  to it)
+- Don't manually install files in %%install that aren't going to be packaged
+- Preserve timestamps of files copied directly from source to installed package
+- Encode ChangeLog as UTF-8
+- Fix multiarch conflicts in %%{_bindir}/gnome-config,
+  %%{_bindir}/libart-config, and
+  %%{_includedir}/gnome-1.0/libart_lgpl/art_config.h (#341321)
+
 * Fri Mar  9 2007 Paul Howarth <paul at city-fan.org> 1:1.4.2-5
 - Fix GnomeDateEdit time format regression (#230186)