rpms/gnome-libs/F-8 gnome-libs-1.4.2-multiarch.patch, NONE, 1.1 gnome-libs-1.4.2-umode_t.patch, NONE, 1.1 gnome-libs-1.4.2-xdg-open.patch, NONE, 1.1 gnome-libs.spec, 1.3, 1.4
Paul Howarth (pghmcfc)
fedora-extras-commits at redhat.com
Fri Oct 26 13:54:26 UTC 2007
- Previous message (by thread): rpms/openobex/devel openobex-1.3-autoconf.patch, NONE, 1.1 openobex.spec, 1.26, 1.27
- Next message (by thread): rpms/libglade/F-8 libglade-0.17-multiarch.patch, NONE, 1.1 libglade-0.17-no-local-intl.patch, NONE, 1.1 libglade.spec, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: pghmcfc
Update of /cvs/pkgs/rpms/gnome-libs/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4530
Modified Files:
gnome-libs.spec
Added Files:
gnome-libs-1.4.2-multiarch.patch
gnome-libs-1.4.2-umode_t.patch gnome-libs-1.4.2-xdg-open.patch
Log Message:
resync with devel
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]"
gnome-libs-1.4.2-umode_t.patch:
--- NEW FILE gnome-libs-1.4.2-umode_t.patch ---
ppc64 has umode_t defined as int in asm/types.h, which is called
(in a roundabout way) from sys/wait.h via signal.h
Adding signal.h here lets the configure script find it, avoiding
breakage when it comes to building libgnome/gnome-exec.c
--- gnome-libs-1.4.2/configure 2007-10-25 11:51:18.000000000 +0100
+++ gnome-libs-1.4.2/configure 2007-10-25 12:27:30.000000000 +0100
@@ -11297,6 +11297,7 @@
#include <stdlib.h>
#include <stddef.h>
#endif
+#include <signal.h>
EOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
egrep "(^|[^a-zA-Z_0-9])umode_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
gnome-libs-1.4.2-xdg-open.patch:
--- NEW FILE gnome-libs-1.4.2-xdg-open.patch ---
--- gnome-libs-1.4.2/libgnome/gnome-url.c 2007-10-26 09:37:05.000000000 +0100
+++ gnome-libs-1.4.2/libgnome/gnome-url.c 2007-10-26 09:43:37.000000000 +0100
@@ -31,7 +31,7 @@
static gchar *uri_get_file_uri_from_ghelp_uri (const gchar *path);
-#define DEFAULT_HANDLER "htmlview \"%s\""
+#define DEFAULT_HANDLER "xdg-open \"%s\""
static gchar *
gnome_url_default_handler (const char *protocol)
@@ -74,7 +74,7 @@
strcmp (protocol, "man") == 0)) {
return app;
} else {
- /* always force use of htmlview */
+ /* always force use of xdg-open */
default_handler = DEFAULT_HANDLER;
}
} else {
@@ -84,7 +84,7 @@
strcmp (protocol, "man") == 0)) {
default_handler = str;
} else {
- /* force htmlview */
+ /* force xdg-open */
default_handler = DEFAULT_HANDLER;
}
}
@@ -141,14 +141,14 @@
/* We no longer have any app (other than Galeon)
* that can handle both ghelp: URI's and GNOME 1
* help files, so do a hardcoded translation
- * and then run htmlview.
+ * and then run xdg-open.
*/
if (strstr (url, "galeon") != NULL) {
/* But always use Galeon for Galeon */
template = "galeon \"%s\"";
} else {
url = tmp_url = uri_get_file_uri_from_ghelp_uri (pos + 1);
- template = "htmlview \"%s\"";
+ template = "xdg-open \"%s\"";
}
} else {
path = g_strconcat ("/Gnome/URL Handlers/", protocol, "-show", NULL);
Index: gnome-libs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-libs/F-8/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 26 Oct 2007 13:53:49 -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
@@ -18,7 +18,11 @@
Source3: http://downloads.sleepycat.com/db.1.85.tar.gz
Source4: utf8-ta.po
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%if 0%{?fedora} >= 7
+Requires: xdg-utils
+%else
Requires: htmlview
+%endif
# Make sure utmp group exists at install time (#24171)
Requires: utempter
@@ -57,7 +61,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 +69,9 @@
# 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
+Patch103: gnome-libs-1.4.2-umode_t.patch
+Patch104: gnome-libs-1.4.2-xdg-open.patch
%description
GNOME (GNU Network Object Model Environment) is a user-friendly set of GUI
@@ -75,12 +82,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 +135,18 @@
%patch100 -p1 -b .multilib
%patch101 -p1 -b .dateedit-fix1
+%patch102 -p1 -b .multiarch
+%patch103 -p1 -b .umode_t
+%if 0%{?fedora} >= 7
+%patch104 -p1 -b .xdg-open
+%endif
+
+/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 +181,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 +218,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 +230,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 +254,58 @@
%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
+* Fri Oct 26 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)
+- Add patch to help configure find umode_t and hence avoid ppc64 build failure
+- Use xdg-open in preference to htmlview for Fedora 7 onwards
+
* Fri Mar 9 2007 Paul Howarth <paul at city-fan.org> 1:1.4.2-5
- Fix GnomeDateEdit time format regression (#230186)
- Previous message (by thread): rpms/openobex/devel openobex-1.3-autoconf.patch, NONE, 1.1 openobex.spec, 1.26, 1.27
- Next message (by thread): rpms/libglade/F-8 libglade-0.17-multiarch.patch, NONE, 1.1 libglade-0.17-no-local-intl.patch, NONE, 1.1 libglade.spec, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list