[svn] r5385 - in trunk/rpms: geomview getmail pine python-eyed3 qemu

packagers at lists.rpmforge.net packagers at lists.rpmforge.net
Thu May 10 16:07:26 CEST 2007


Author: dag
Date: 2007-05-10 16:07:24 +0200 (Thu, 10 May 2007)
New Revision: 5385

Added:
   trunk/rpms/pine/pine-4.64-all.patch.gz
   trunk/rpms/pine/pine-4.64-imap-4.7c2-flock.patch
   trunk/rpms/pine/pinepgp-0.18.0-compile.patch
   trunk/rpms/qemu/qemu-0.8.0-sdata.patch
   trunk/rpms/qemu/qemu-0.9.0-load-initrd.patch
Modified:
   trunk/rpms/geomview/geomview.spec
   trunk/rpms/getmail/getmail.spec
   trunk/rpms/python-eyed3/python-eyed3.spec
   trunk/rpms/qemu/qemu-0.7.0-build.patch
   trunk/rpms/qemu/qemu.spec
Log:
Updates

Modified: trunk/rpms/geomview/geomview.spec
===================================================================
--- trunk/rpms/geomview/geomview.spec	2007-05-09 22:18:54 UTC (rev 5384)
+++ trunk/rpms/geomview/geomview.spec	2007-05-10 14:07:24 UTC (rev 5385)
@@ -14,6 +14,11 @@
 %{?el2:%define _without_modxorg 1}
 %{?yd3:%define _without_modxorg 1}
 
+%{!?dist:%define _with_lesstif 1}
+%{?fc6:%define _with_lesstif 1}
+%{?fc3:%define _with_lesstif 1}
+%{?el2:%define _with_lesstif 1}
+
 Summary: View and manipulate 3D geometric objects
 Name: geomview
 Version: 1.9.1
@@ -26,8 +31,9 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires: gcc-c++
-%{!?_without_modxorg:BuildRequires: mesa-libGL-devel, mesa-libGLU-devel, lesstif-devel, libXmu-devel, libXext-devel, libSM-devel}
+%{!?_without_modxorg:BuildRequires: mesa-libGL-devel, mesa-libGLU-devel, libXmu-devel, libXext-devel, libSM-devel}
 %{?_without_modxorg:BuildRequires: XFree86-devel}
+%{?_with_lesstif:BuildRequires: lesstif-devel}
 
 %description
 Geomview is an interactive program written by the staff of the Geometry 

Modified: trunk/rpms/getmail/getmail.spec
===================================================================
--- trunk/rpms/getmail/getmail.spec	2007-05-09 22:18:54 UTC (rev 5384)
+++ trunk/rpms/getmail/getmail.spec	2007-05-10 14:07:24 UTC (rev 5385)
@@ -14,10 +14,9 @@
 Source: http://pyropus.ca/software/getmail/old-versions/getmail-%{version}.tar.gz
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
-#BuildRequires: python-devel = 2.3
-BuildRequires: python-devel
-Requires: python >= 1.5.2
 BuildArch: noarch
+BuildRequires: python-devel >= 2.3.3
+Requires: python >= 2.3.3
 
 %description
 getmail is intended as a simple replacement for fetchmail for those people
@@ -27,7 +26,6 @@
 per-account basis.  It can also deliver into mbox files, although this
 should not be attempted over NFS.  getmail is written entirely in python.
 
-
 %prep
 %setup
 
@@ -35,7 +33,7 @@
 
 %install
 %{__rm} -rf %{buildroot}
-python setup.py install --root="%{buildroot}"
+%{__python} setup.py install --root="%{buildroot}"
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -43,8 +41,14 @@
 %files
 %defattr(-, root, root, 0755)
 %doc docs/*
-%doc %{_mandir}/man1/*.1*
-%{_bindir}/getmail*
+%doc %{_mandir}/man1/getmail.1*
+%doc %{_mandir}/man1/getmail_fetch.1*
+%doc %{_mandir}/man1/getmail_maildir.1*
+%doc %{_mandir}/man1/getmail_mbox.1*
+%{_bindir}/getmail
+%{_bindir}/getmail_fetch
+%{_bindir}/getmail_maildir
+%{_bindir}/getmail_mbox
 %{python_sitelib}/getmailcore/
 
 %changelog

Added: trunk/rpms/pine/pine-4.64-all.patch.gz
===================================================================
(Binary files differ)


Property changes on: trunk/rpms/pine/pine-4.64-all.patch.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/rpms/pine/pine-4.64-imap-4.7c2-flock.patch
===================================================================
--- trunk/rpms/pine/pine-4.64-imap-4.7c2-flock.patch	                        (rev 0)
+++ trunk/rpms/pine/pine-4.64-imap-4.7c2-flock.patch	2007-05-10 14:07:24 UTC (rev 5385)
@@ -0,0 +1,13 @@
+--- imap/src/osdep/unix/Makefile.orig	2004-05-18 03:49:56.000000000 +0200
++++ imap/src/osdep/unix/Makefile	2004-05-18 03:50:51.000000000 +0200
+@@ -116,8 +116,8 @@
+ BINARIES=osdep.o mail.o misc.o newsrc.o smanager.o utf8.o siglocal.o \
+  dummy.o pseudo.o netmsg.o flstring.o fdstring.o \
+  rfc822.o nntp.o smtp.o imap4r1.o pop3.o \
+- unix.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o maildir.o
+-CFLAGS=-g
++ unix.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o maildir.o flock.o
++CFLAGS=$(BASECFLAGS) $(EXTRACFLAGS)
+ 
+ CAT=cat
+ MAKE=make

Added: trunk/rpms/pine/pinepgp-0.18.0-compile.patch
===================================================================
--- trunk/rpms/pine/pinepgp-0.18.0-compile.patch	                        (rev 0)
+++ trunk/rpms/pine/pinepgp-0.18.0-compile.patch	2007-05-10 14:07:24 UTC (rev 5385)
@@ -0,0 +1,46 @@
+diff -Nru pinepgp-0.18.0-old/Makefile.in pinepgp-0.18.0/Makefile.in
+--- pinepgp-0.18.0-old/Makefile.in	2002-05-03 08:30:07.000000000 -0500
++++ pinepgp-0.18.0/Makefile.in	2006-11-07 00:47:16.000000000 -0600
+@@ -1,5 +1,6 @@
+ # makefile for 'pinepgp'
+ 
++SHELL=/bin/csh
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ bindir=@bindir@
+@@ -60,7 +61,7 @@
+ 		s%^cese=.*%cese="$(GPG) -at -se"%;\
+ 		s%^cec=.*%cec="\$(GPG)"%;\
+ 		s%^cefp=.*%cefp=gpg%' > $(@).c
+-	$(CPP) -DGPG $(BUILD_FLAGS) $(@).c | $(GREP) -v "^# .* .*" > $(@)
++	-$(CPP) -DGPG $(BUILD_FLAGS) $(@).c | $(GREP) -v "^# .* .*" > $(@)
+ 	chmod 755 $(@)
+ 
+ pinepgp26x:	pinegpgp
+@@ -70,7 +71,7 @@
+ 		s%^cese=.*%cese="\$(PGP) -fat -se"%;\
+ 		s%^cec=.*%cec="\$(PGP) -f"%;\
+ 		s%^cefp=.*%cefp=pgp26x%' > $(@).c
+-	$(CPP) -DPGP26X $(BUILD_FLAGS) $(@).c | $(GREP) -v "^# .* .*" > $(@)
++	-$(CPP) -DPGP26X $(BUILD_FLAGS) $(@).c | $(GREP) -v "^# .* .*" > $(@)
+ 	chmod 755 $(@)
+ 
+ pinepgp5x:	pinegpgp
+@@ -80,7 +81,7 @@
+ 		s%^cese=.*%cese="$(PGP5E) -fat -s"%;\
+ 		s%^cec=.*%cec="$(PGP5V) -f"%;\
+ 		s%^cefp=.*%cefp=pgp26x%' > $(@).c
+-	$(CPP) -DPGP5X $(BUILD_FLAGS) $(@).c | $(GREP) -v "^# .* .*" > $(@)
++	-$(CPP) -DPGP5X $(BUILD_FLAGS) $(@).c | $(GREP) -v "^# .* .*" > $(@)
+ 	chmod 755 $(@)
+ 
+ pinepgp65x:	pinegpgp
+@@ -90,7 +91,7 @@
+ 		s%^cese=.*%cese="\$(PGP6) -fat -se -u $$USER"%;\
+ 		s%^cec=.*%cec="\$(PGP6) -f -u $$USER"%;\
+ 		s%^cefp=.*%cefp=pgp65x%' > $(@).c
+-	$(CPP) -DPGP65X $(BUILD_FLAGS) $(@).c | $(GREP) -v "^# .* .*" > $(@)
++	-$(CPP) -DPGP65X $(BUILD_FLAGS) $(@).c | $(GREP) -v "^# .* .*" > $(@)
+ 	chmod 755 $(@)
+ 
+ install:	$(BUILD_FILTERS:%=install-%)

Modified: trunk/rpms/python-eyed3/python-eyed3.spec
===================================================================
--- trunk/rpms/python-eyed3/python-eyed3.spec	2007-05-09 22:18:54 UTC (rev 5384)
+++ trunk/rpms/python-eyed3/python-eyed3.spec	2007-05-10 14:07:24 UTC (rev 5385)
@@ -8,7 +8,7 @@
 
 Summary: Python Module for ID3 Tag Manipulation
 Name: python-eyed3
-Version: 0.6.13
+Version: 0.6.14
 Release: 1
 License: GPL
 Group: Development/Libraries
@@ -51,6 +51,9 @@
 %{python_sitelib}/eyeD3/
 
 %changelog
+* Thu May 10 2007 Dag Wieers <dag at wieers.com> - 0.6.14-1
+- Updated to release 0.6.14.
+
 * Wed May 02 2007 Dag Wieers <dag at wieers.com> - 0.6.13-1
 - Updated to release 0.6.13.
 

Modified: trunk/rpms/qemu/qemu-0.7.0-build.patch
===================================================================
--- trunk/rpms/qemu/qemu-0.7.0-build.patch	2007-05-09 22:18:54 UTC (rev 5384)
+++ trunk/rpms/qemu/qemu-0.7.0-build.patch	2007-05-10 14:07:24 UTC (rev 5385)
@@ -1,39 +1,11 @@
---- Makefile.orig	2005-04-27 21:52:05.000000000 +0100
-+++ Makefile	2005-04-30 11:01:41.000000000 +0100
-@@ -1,6 +1,6 @@
- -include config-host.mak
- 
--CFLAGS=-Wall -O2 -g -fno-strict-aliasing 
-+CFLAGS=$(RPM_OPT_FLAGS) -Wall -fno-strict-aliasing 
- ifdef CONFIG_DARWIN
- CFLAGS+= -mdynamic-no-pic
- endif
---- Makefile.target.orig	2005-04-27 21:52:05.000000000 +0100
-+++ Makefile.target	2005-04-30 11:03:59.000000000 +0100
-@@ -14,7 +14,7 @@
- VPATH+=:$(SRC_PATH)/linux-user
- DEFINES+=-I$(SRC_PATH)/linux-user -I$(SRC_PATH)/linux-user/$(TARGET_ARCH)
- endif
--CFLAGS=-Wall -O2 -g -fno-strict-aliasing
-+CFLAGS=$(RPM_OPT_FLAGS) -Wall -fno-strict-aliasing
- #CFLAGS+=-Werror
- LDFLAGS=-g
- LIBS=
-@@ -177,7 +177,7 @@
- ifeq ($(ARCH),alpha)
- # -msmall-data is not used because we want two-instruction relocations
- # for the constant constructions
--OP_CFLAGS=-Wall -O2 -g
-+OP_CFLAGS=$(RPM_OPT_FLAGS) -Wall
- # Ensure there's only a single GP
- CFLAGS += -msmall-data
- LDFLAGS+=-Wl,-T,$(SRC_PATH)/alpha.ld
+--- qemu-0.7.0/Makefile.target.orig	2005-04-27 21:52:05.000000000 +0100
++++ qemu-0.7.0/Makefile.target	2005-04-30 11:01:41.000000000 +0100
 @@ -463,7 +463,7 @@
  
  install: all 
  ifneq ($(PROGS),)
--	install -m 755 -s $(PROGS) "$(bindir)"
-+	install -m 755 $(PROGS) "$(bindir)"
+-	$(INSTALL) -m 755 -s $(PROGS) "$(DESTDIR)$(bindir)"
++	$(INSTALL) -m 755 $(PROGS) "$(DESTDIR)$(bindir)"
  endif
  
  ifneq ($(wildcard .depend),)

Added: trunk/rpms/qemu/qemu-0.8.0-sdata.patch
===================================================================
--- trunk/rpms/qemu/qemu-0.8.0-sdata.patch	                        (rev 0)
+++ trunk/rpms/qemu/qemu-0.8.0-sdata.patch	2007-05-10 14:07:24 UTC (rev 5385)
@@ -0,0 +1,15 @@
+--- qemu-0.8.0/ppc.ld~	2005-12-19 22:51:53.000000000 +0000
++++ qemu-0.8.0/ppc.ld	2006-03-21 16:46:58.000000000 +0000
+@@ -90,7 +90,11 @@ SECTIONS
+   /* We want the small data sections together, so single-instruction offsets
+      can access them all, and initialized data all before uninitialized, so
+      we can shorten the on-disk segment size.  */
+-  .sdata     : { *(.sdata) }
++  .sdata     :
++  {
++    PROVIDE (_SDA_BASE_ = 32768);
++    *(.sdata .sdata.* .gnu.linkonce.s.*)
++  }
+   _edata  =  .;
+   PROVIDE (edata = .);
+   __bss_start = .;

Added: trunk/rpms/qemu/qemu-0.9.0-load-initrd.patch
===================================================================
--- trunk/rpms/qemu/qemu-0.9.0-load-initrd.patch	                        (rev 0)
+++ trunk/rpms/qemu/qemu-0.9.0-load-initrd.patch	2007-05-10 14:07:24 UTC (rev 5385)
@@ -0,0 +1,63 @@
+--- hw/pc.c.orig	2007-02-06 07:01:54.000000000 +0800
++++ hw/pc.c	2007-04-01 22:19:50.000000000 +0800
+@@ -32,9 +32,11 @@
+ #define LINUX_BOOT_FILENAME "linux_boot.bin"
+ 
+ #define KERNEL_LOAD_ADDR     0x00100000
+-#define INITRD_LOAD_ADDR     0x00600000
++#define MAX_INITRD_LOAD_ADDR 0x38000000
+ #define KERNEL_PARAMS_ADDR   0x00090000
+ #define KERNEL_CMDLINE_ADDR  0x00099000
++/* Leave a chunk of memory at the top of RAM for the BIOS ACPI tables.  */
++#define ACPI_DATA_SIZE       0x10000
+ 
+ static fdctrl_t *floppy_controller;
+ static RTCState *rtc_state;
+@@ -451,7 +453,7 @@
+ {
+     char buf[1024];
+     int ret, linux_boot, initrd_size, i;
+-    unsigned long bios_offset, vga_bios_offset, option_rom_offset;
++    unsigned long bios_offset, vga_bios_offset, option_rom_offset, initrd_offset;
+     int bios_size, isa_bios_size;
+     PCIBus *pci_bus;
+     int piix3_devfn = -1;
+@@ -576,8 +578,28 @@
+         
+         /* load initrd */
+         initrd_size = 0;
++        initrd_offset = 0;
+         if (initrd_filename) {
+-            initrd_size = load_image(initrd_filename, phys_ram_base + INITRD_LOAD_ADDR);
++            initrd_size = get_image_size (initrd_filename);
++            if (initrd_size > 0) {
++                initrd_offset = (ram_size - initrd_size) & TARGET_PAGE_MASK;
++                /* Leave space for BIOS ACPI tables.  */
++                initrd_offset -= ACPI_DATA_SIZE;
++                /* Avoid the last 64k to avoid 2.2.x kernel bugs.  */
++                initrd_offset -= 0x10000;
++                if (initrd_offset > MAX_INITRD_LOAD_ADDR)
++                    initrd_offset = MAX_INITRD_LOAD_ADDR;
++
++                if (initrd_size > ram_size
++                    || initrd_offset < KERNEL_LOAD_ADDR + ret) {
++                    fprintf(stderr,
++                            "qemu: memory too small for initial ram disk '%s'\n",
++                            initrd_filename);
++                    exit(1);
++                }
++                initrd_size = load_image(initrd_filename,
++                                         phys_ram_base + initrd_offset);
++            }
+             if (initrd_size < 0) {
+                 fprintf(stderr, "qemu: could not load initial ram disk '%s'\n", 
+                         initrd_filename);
+@@ -585,7 +607,7 @@
+             }
+         }
+         if (initrd_size > 0) {
+-            stl_raw(phys_ram_base + KERNEL_PARAMS_ADDR + 0x218, INITRD_LOAD_ADDR);
++            stl_raw(phys_ram_base + KERNEL_PARAMS_ADDR + 0x218, initrd_offset);
+             stl_raw(phys_ram_base + KERNEL_PARAMS_ADDR + 0x21c, initrd_size);
+         }
+         pstrcpy(phys_ram_base + KERNEL_CMDLINE_ADDR, 4096,

Modified: trunk/rpms/qemu/qemu.spec
===================================================================
--- trunk/rpms/qemu/qemu.spec	2007-05-09 22:18:54 UTC (rev 5384)
+++ trunk/rpms/qemu/qemu.spec	2007-05-10 14:07:24 UTC (rev 5385)
@@ -2,22 +2,31 @@
 # Authority: dag
 # Upstream: Fabrice Bellard <fabrice$bellard,org>
 
+%{?dist: %{expand: %%define %dist 1}}
+
+%{?el5:%define _with_compat_gcc_version 34}
+
+%{?el3:%define _without_alsa 1}
+%{?rh9:%define _without_alsa 1}
+%{?rh7:%define _without_alsa 1}
+%{?el2:%define _without_alsa 1}
+
 Summary: CPU emulator
 Name: qemu
 Version: 0.9.0
-Release: 1
+Release: 2
 License: GPL
 Group: Applications/Emulators
 URL: http://qemu.org/
 
 Source: http://qemu.org/qemu-%{version}.tar.gz
-#Patch0: qemu-0.8.2-build.patch
-Patch1: qemu-0.7.0-dyngen.patch
-#Patch2: qemu-0.7.0-gcc4-x86.patch
-#Patch3: qemu-0.7.0-gcc4-ppc.patch
+Patch0: qemu-0.7.0-build.patch
+Patch1: qemu-0.8.0-sdata.patch
+Patch2: qemu-0.9.0-load-initrd.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
-BuildRequires: SDL-devel
+BuildRequires: zlib-devel, SDL-devel
+%{?_with_compat_gcc_version:BuildRequires: compat-gcc-%{_with_compat_gcc_version}}
 #BuildRequires: texi2html
 
 %description
@@ -40,10 +49,9 @@
 
 %prep
 %setup
-#patch0 -b .build
-%patch1 -b .dyngen
-#%patch2
-#%patch3
+%patch0 -p1
+%patch1 -p1
+%patch2 -p0
 
 %{__cat} <<'EOF' >qemu.sysv
 #!/bin/sh
@@ -139,24 +147,25 @@
 exit $RETVAL
 EOF
 
-
-
 %build
-%configure \
-	--disable-gcc-check --interp-prefix="%{_prefix}/qemu-%%M" \
-
-%{__perl} -pi.orig -e '
-		s|\$\(datadir\)|\$(datadir)/qemu|;
-		s|\$\(sharedir\)|\$(datadir)/qemu|;
-		s|\$\(prefix\)/bin|\$(bindir)|;
-		s|/usr/share|\$(datadir)/qemu|;
-	' Makefile* config-host.mak
-
+#configure \
+./configure \
+	--prefix="%{_prefix}" \
+	--cc="gcc%{?_with_compat_gcc_version}" \
+	--interp-prefix="%{_prefix}/qemu-%%M" \
+%{!?_without_alsa:--enable-alsa}
+#	--disable-gcc-check
 %{__make} %{?_smp_mflags}
 
 %install
 %{__rm} -rf %{buildroot}
-%makeinstall
+%{__make} install \
+	prefix="%{buildroot}%{_prefix}" \
+	bindir="%{buildroot}%{_bindir}" \
+	sharedir="%{buildroot}%{_datadir}/qemu" \
+	mandir="%{buildroot}%{_mandir}" \
+	datadir="%{buildroot}%{_datadir}/qemu" \
+	docdir="./rpm-doc"
 
 %{__install} -Dp -m0755 qemu.sysv %{buildroot}%{_initrddir}/qemu
 
@@ -175,19 +184,17 @@
 
 %files
 %defattr(-, root, root, 0755)
-%doc *.html Changelog COPYING* README* TODO
-%doc %{_mandir}/man1/qemu*
+%doc Changelog COPYING* LICENSE README* TODO *.html
+%doc %{_mandir}/man1/qemu.1*
+%doc %{_mandir}/man1/qemu-img.1*
 %config %{_initrddir}/qemu
 %{_bindir}/qemu*
-%dir %{_datadir}/qemu/
-%{_datadir}/qemu/keymaps/
-%{_datadir}/qemu/*.bin
-#%{_datadir}/qemu/*.elf
-%{_datadir}/qemu/openbios-sparc32
-%{_datadir}/qemu/video.x
-%exclude %{_datadir}/qemu/doc/
+%{_datadir}/qemu/
 
 %changelog
+* Thu May 10 2007 Dag Wieers <dag at wieers.com> - 0.9.0-2
+- Added patches from Fedora.
+
 * Sun Feb 11 2007 Dag Wieers <dag at wieers.com> - 0.9.0-1
 - Updated to release 0.9.0.
 




More information about the commits mailing list