rpms/gnome-libs/devel gnome-libs-1.4.2-multilib.patch, NONE, 1.1 gnome-libs.spec, 1.1, 1.2
Paul Howarth (pghmcfc)
fedora-extras-commits at redhat.com
Tue Feb 13 12:37:23 UTC 2007
- Previous message: rpms/python-simpy/FC-5 .cvsignore, 1.4, 1.5 python-simpy.spec, 1.12, 1.13 sources, 1.4, 1.5
- Next message: rpms/codeblocks/devel codeblocks-wx28-wizard.patch, NONE, 1.1 .cvsignore, 1.13, 1.14 codeblocks.spec, 1.13, 1.14 sources, 1.13, 1.14
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: pghmcfc
Update of /cvs/extras/rpms/gnome-libs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26342
Modified Files:
gnome-libs.spec
Added Files:
gnome-libs-1.4.2-multilib.patch
Log Message:
Fix multilib conflict in /etc/mime-magic.dat (#228361)
gnome-libs-1.4.2-multilib.patch:
--- NEW FILE gnome-libs-1.4.2-multilib.patch ---
--- gnome-libs-1.4.2/libgnome/gnome-magic.c 2000-03-06 16:37:04.000000000 +0000
+++ gnome-libs-1.4.2/libgnome/gnome-magic.c 2007-02-13 11:36:18.000000000 +0000
@@ -188,6 +188,7 @@
while(fgets(aline, sizeof(aline), infile)) {
curpos = aline;
+ memset(&newent, 0, sizeof(newent));
while(*curpos && isspace(*curpos)) curpos++; /* eat the head */
if(!isdigit(*curpos)) continue;
Index: gnome-libs.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-libs/devel/gnome-libs.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-libs.spec 14 Sep 2006 06:23:10 -0000 1.1
+++ gnome-libs.spec 13 Feb 2007 12:36:51 -0000 1.2
@@ -5,7 +5,7 @@
Name: gnome-libs
Epoch: 1
Version: 1.4.2
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: The main GNOME1 libraries
License: LGPL
Group: System Environment/Libraries
@@ -62,6 +62,9 @@
Patch81: db.1.85.s390.patch
Patch82: db.1.85.nodebug.patch
+# Fedora patches
+Patch100: gnome-libs-1.4.2-multilib.patch
+
%description
GNOME (GNU Network Object Model Environment) is a user-friendly set of GUI
applications and desktop tools to be used in conjunction with a window manager
@@ -120,6 +123,8 @@
%patch82 -p1 -b .nodebug
cd -
+%patch100 -p1 -b .multilib
+
%build
## db1
@@ -212,7 +217,7 @@
%postun -p /sbin/ldconfig
%files -f %{name}.lang
-%defattr(-,root,root,755)
+%defattr(-,root,root,-)
%doc AUTHORS COPYING COPYING.LIB ChangeLog NEWS README %{dbdir}/LICENSE %{dbdir}/changelog
%{_bindir}/db1_dump185
%{_bindir}/dns-helper
@@ -242,7 +247,7 @@
%config %{_sysconfdir}/sound/events/*.soundlist
%files devel
-%defattr(-,root,root,755)
+%defattr(-,root,root,-)
%{_bindir}/gnome-config
%{_bindir}/libart-config
%{_bindir}/gnome-doc
@@ -256,6 +261,9 @@
%{_datadir}/emacs/site-lisp/gnome-doc.el
%changelog
+* Tue Feb 13 2007 Paul Howarth <paul at city-fan.org> 1:1.4.2-4
+- Fix multilib conflict in /etc/mime-magic.dat (#228361)
+
* Wed Sep 13 2006 Paul Howarth <paul at city-fan.org> 1:1.4.2-3
- Add full URLs or CVS information for source files
- Remove conflicts for ancient glibc versions
- Previous message: rpms/python-simpy/FC-5 .cvsignore, 1.4, 1.5 python-simpy.spec, 1.12, 1.13 sources, 1.4, 1.5
- Next message: rpms/codeblocks/devel codeblocks-wx28-wizard.patch, NONE, 1.1 .cvsignore, 1.13, 1.14 codeblocks.spec, 1.13, 1.14 sources, 1.13, 1.14
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list