scm-commits November 2004

scm-commits@lists.fedoraproject.org

5 participants
1658 discussions

[fedora-extras-commits] rpms/apt/devel rpmpriorities,NONE,1.1
by fedora-extras-commits＠redhat.com 10 Nov '04

10 Nov '04

Changeset from: mschwendt Update of /cvs/extras/rpms/apt/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv3999 Added Files: rpmpriorities Log Message: Add the single missing rpmpriorities file. --- NEW FILE rpmpriorities --- Essential: grub termcap ed kbd iproute libtermcap libgcc setserial file rpm sysklogd losetup ash kudzu glibc shadow-utils coreutils bash iputils vim-minimal passwd cpio raidtools SysVinit authconfig hdparm hotplug readline util-linux basesystem setup e2fsprogs procps initscripts filesystem fedora-release Important: kernel

1 0

[fedora-extras-commits] rpms/apt/devel rpmpriorities.1, 1.1, NONE rpmpriorities.2, 1.1, NONE
by fedora-extras-commits＠redhat.com 10 Nov '04

10 Nov '04

Changeset from: mschwendt Update of /cvs/extras/rpms/apt/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv3863 Removed Files: rpmpriorities.1 rpmpriorities.2 Log Message: Obsolete. --- rpmpriorities.1 DELETED --- --- rpmpriorities.2 DELETED ---

1 0

[fedora-extras-commits] rpms/dosbox/devel dosbox.png, NONE, 1.1 dosbox.desktop, 1.1, 1.2 dosbox.spec, 1.4, 1.5
by fedora-extras-commits＠redhat.com 10 Nov '04

10 Nov '04

Changeset from: mschwendt Update of /cvs/extras/rpms/dosbox/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv3323 Modified Files: dosbox.desktop dosbox.spec Added Files: dosbox.png Log Message: Add desktop file icon. Index: dosbox.desktop =================================================================== RCS file: /cvs/extras/rpms/dosbox/devel/dosbox.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- dosbox.desktop 8 Nov 2004 04:14:17 -0000 1.1 +++ dosbox.desktop 10 Nov 2004 05:03:39 -0000 1.2 @@ -1,8 +1,9 @@ [Desktop Entry] +Encoding=UTF-8 Name=DOSBox Comment=An x86/DOS emulator with sound/graphics Exec=dosbox +Icon=dosbox.png Terminal=false Type=Application -Encoding=UTF-8 Categories=Application;Utility; Index: dosbox.spec =================================================================== RCS file: /cvs/extras/rpms/dosbox/devel/dosbox.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- dosbox.spec 8 Nov 2004 04:14:35 -0000 1.4 +++ dosbox.spec 10 Nov 2004 05:03:39 -0000 1.5 @@ -1,6 +1,6 @@ Name: dosbox Version: 0.58 -Release: 0.fdr.3.2 +Release: 4 Epoch: 0 Summary: An x86/DOS emulator with sound/graphics @@ -9,6 +9,7 @@ URL: http://dosbox.sf.net Source0: http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source1: dosbox.desktop +Source2: dosbox.png BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: libpng-devel @@ -48,6 +49,9 @@ --add-category=X-Fedora \ %{SOURCE1} +mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/pixmaps +install -p -m 0644 %SOURCE2 ${RPM_BUILD_ROOT}%{_datadir}/pixmaps + %clean rm -rf ${RPM_BUILD_ROOT} @@ -59,9 +63,13 @@ %{_bindir}/* %{_mandir}/man1/* %{_datadir}/applications/* +%{_datadir}/pixmaps/dosbox.png %changelog +* Wed Nov 10 2004 Michael Schwendt <mschwendt[AT]users.sf.net> - 0:0.58-4 +- Add a desktop file icon from upstream package (fixes fedora.us #1144). + * Sun Jul 27 2003 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0:0.58-0.fdr.3 - Fixed minor stuff from #442 #3

1 0

[fedora-extras-commits] Test from me
by fedora-extras-commits＠redhat.com 09 Nov '04

09 Nov '04

test from me Cristian -- ---------------------------------------------------------------------- Cristian Gafton -- gafton(a)redhat.com -- Red Hat, Inc. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ "Linux is a leprosy; and is having a deleterious effect on the U.S. IT industry because it is steadily depreciating the value of the software industry sector." -- Kenneth Brown, President, Alexis de Tocqueville Institution

1 0

[fedora-extras-commits] rpms/xmms-sid/devel xmms-sid-0.7.4-gcc34.patch, NONE, 1.1 xmms-sid.spec, 1.4, 1.5
by fedora-extras-commits＠redhat.com 09 Nov '04

09 Nov '04

Update of /cvs/extras/rpms/xmms-sid/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv3031 Modified Files: xmms-sid.spec Added Files: xmms-sid-0.7.4-gcc34.patch Log Message: Fix src/xmms-sid.cc for GCC 3.4/FC3. xmms-sid-0.7.4-gcc34.patch: --- NEW FILE xmms-sid-0.7.4-gcc34.patch --- diff -Nur xmms-sid-0.7.4-orig/src/xmms-sid.cc xmms-sid-0.7.4/src/xmms-sid.cc --- xmms-sid-0.7.4-orig/src/xmms-sid.cc 2002-09-02 23:55:29.000000000 +0200 +++ xmms-sid-0.7.4/src/xmms-sid.cc 2004-11-10 04:13:37.000000000 +0100 @@ -196,7 +196,7 @@ int fxlen, tn; struct sidTuneInfo sidInf; char *name; - enum AFormat fmt = (xs_emuConf.bitsPerSample == 16) ? FMT_S16_NE : FMT_U8; + AFormat fmt = (xs_emuConf.bitsPerSample == 16) ? FMT_S16_NE : FMT_U8; gint chn = xs_emuConf.channels; tune->getInfo(sidInf); Index: xmms-sid.spec =================================================================== RCS file: /cvs/extras/rpms/xmms-sid/devel/xmms-sid.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- xmms-sid.spec 8 Nov 2004 05:35:54 -0000 1.4 +++ xmms-sid.spec 10 Nov 2004 04:05:42 -0000 1.5 @@ -3,13 +3,14 @@ Summary: SIDPlay input plugin for X MultiMedia System (XMMS) Name: xmms-sid Version: 0.7.4 -Release: 0.fdr.3.1.90 +Release: 4 Epoch: 0 URL: http://www.tnsp.org/xmms-sid.php License: GPL Group: Applications/Multimedia Source0: http://www.tnsp.org/xs-files/%{name}-%{version}.tar.bz2 Patch0: xmms-sid-0.7.4-cflags.patch +Patch1: xmms-sid-0.7.4-gcc34.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: xmms >= 0:1.2.7 BuildRequires: xmms-devel >= 0:1.2, libsidplay-devel >= 0:1.36.57 @@ -31,6 +32,7 @@ %prep %setup -q %patch0 -p1 -b .cflags +%patch1 -p1 -b .gcc34 #--------------------------------------------------------------------- @@ -62,6 +64,9 @@ #--------------------------------------------------------------------- %changelog +* Wed Nov 10 2004 Michael Schwendt <mschwendt[AT]users.sf.net> 0:0.7.4-4 +- Fix src/xmms-sid.cc for GCC 3.4/FC3. + * Fri May 02 2003 Panu Matilainen <pmatilai(a)welho.com> 0:0.7.4-0.fdr.3 - patch to make it honor rpm optflags - use bz2 source instead of gz

1 0

[fedora-extras-commits] rpms/apt/devel apt.spec,1.3,1.4
by fedora-extras-commits＠redhat.com 09 Nov '04

09 Nov '04

Update of /cvs/extras/rpms/apt/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv2918 Modified Files: apt.spec Log Message: Only fix build for FC3 (other updates necessary - see spec changelog). Index: apt.spec =================================================================== RCS file: /cvs/extras/rpms/apt/devel/apt.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- apt.spec 8 Nov 2004 04:04:43 -0000 1.3 +++ apt.spec 10 Nov 2004 03:05:28 -0000 1.4 @@ -10,7 +10,7 @@ Summary: Debian's Advanced Packaging Tool with RPM support. Name: apt Version: 0.5.15cnc6 -Release: 0.fdr.11.2 +Release: 11 Epoch: 0 Group: System Environment/Base URL: https://moin.conectiva.com.br/AptRpm @@ -28,8 +28,7 @@ Source4: apt_preferences # rpmpriorities generated from comps.xml base group -Source5: rpmpriorities.1 -Source6: rpmpriorities.2 +Source5: rpmpriorities # Sources 50-99 are for Lua-scripts Source50: gpg-checker.lua @@ -75,7 +74,7 @@ # for version detection to work BuildRequires: fedora-release -%if "%{rpmver}" == "4.3.1" +%if "%{rpmver}" >= "4.3.1" BuildRequires: libselinux-devel %endif @@ -166,7 +165,7 @@ install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/sources.list install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/vendors.list install -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/preferences -install -p -m 644 $RPM_SOURCE_DIR/rpmpriorities.%{fcrel} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/rpmpriorities +install -p -m 644 %{SOURCE5} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/rpmpriorities # install config parts for cnf in %{SOURCE150} %{SOURCE151}; do @@ -267,6 +266,13 @@ %{_libdir}/python%{pythonver}/site-packages/* %changelog +* Wed Nov 10 2004 Michael Schwendt <mschwendt[AT]users.sf.net> 0.5.15cnc6-11 +- TODO: Somebody with access to www.fedora.us would need to update + Source151 (mirror-select.conf) and update it for FC3. +- Only make this build for FC3 (fix installation of rpmpriorities file + and fixed the inaccurate conditional BR libselinux-devel which could + be made unconditional). + * Fri Apr 09 2004 Panu Matilainen <pmatilai(a)welho.com> 0.5.15cnc6-0.fdr.11 - revert the ctrl-c workaroound, the "cure" is worse than the disease

1 0

[fedora-extras-commits] rpms/libsidplay/devel libsidplay-post57fixes.patch, NONE, 1.1 libsidplay.spec, 1.4, 1.5
by fedora-extras-commits＠redhat.com 09 Nov '04

09 Nov '04

Update of /cvs/extras/rpms/libsidplay/devel In directory cvs.fedora.redhat.com:/tmp/cvs-serv2159 Modified Files: libsidplay.spec Added Files: libsidplay-post57fixes.patch Log Message: Fix build for FC3/GCC 3.4. libsidplay-post57fixes.patch: --- NEW FILE libsidplay-post57fixes.patch --- diff -Nur libsidplay-1.36.57/src/mus_.cpp libsidplay-1.36.59/src/mus_.cpp --- libsidplay-1.36.57/src/mus_.cpp 1999-06-17 07:59:35.000000000 +0200 +++ libsidplay-1.36.59/src/mus_.cpp 2004-08-17 13:43:38.000000000 +0200 @@ -76,7 +76,7 @@ infoString[line][si++] = c; // copy to info string } // If character is 0x9d (left arrow key) then move back. - if ((*spPet == 0x9d) && (si>=0)) + if ((*spPet == 0x9d) && (si>0)) { si--; } diff -Nur libsidplay-1.36.57/src/smart.h libsidplay-1.36.59/src/smart.h --- libsidplay-1.36.57/src/smart.h 2001-12-29 00:10:17.000000000 +0100 +++ libsidplay-1.36.59/src/smart.h 2004-07-17 23:43:15.000000000 +0200 @@ -211,16 +211,16 @@ { if ( bufferLen >= 1 ) { - pBufCurrent = ( bufBegin = buffer ); - bufEnd = bufBegin + bufferLen; - bufLen = bufferLen; - status = true; + this->pBufCurrent = ( this->bufBegin = buffer ); + this->bufEnd = this->bufBegin + bufferLen; + this->bufLen = bufferLen; + this->status = true; } else { - pBufCurrent = bufBegin = bufEnd = 0; - bufLen = 0; - status = false; + this->pBufCurrent = this->bufBegin = this->bufEnd = 0; + this->bufLen = 0; + this->status = false; } } }; Index: libsidplay.spec =================================================================== RCS file: /cvs/extras/rpms/libsidplay/devel/libsidplay.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- libsidplay.spec 8 Nov 2004 04:48:25 -0000 1.4 +++ libsidplay.spec 10 Nov 2004 02:23:35 -0000 1.5 @@ -1,9 +1,10 @@ Name: libsidplay Summary: A Commodore 64 music player and SID chip emulator library. Version: 1.36.57 -Release: 0.fdr.4.2 +Release: 5 Epoch: 0 Source: http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/packages/%{name}-… +Patch: libsidplay-post57fixes.patch Icon: sidplay.xpm Group: System Environment/Libraries URL: http://www.geocities.com/SiliconValley/Lakes/5147/ @@ -27,6 +28,7 @@ %prep %setup -q +%patch -p1 -b .post57fixes %build %ifarch %{ix86} @@ -61,7 +63,12 @@ %{_libdir}/libsidplay.a %{_includedir}/sidplay -%changelog +%changelog +* Wed Nov 10 2004 Michael Schwendt <mschwendt[AT]users.sf.net> 1.36.57-5 +- Fix build for FC3/GCC 3.4 with patch from newer upstream release + (I'm still upstream for this, afaik). +- Bump release. + * Fri Apr 25 2003 Panu Matilainen <pmatilai(a)welho.com> 1.36.57-0.fdr.4 - strict dependency in -devel package - simpler arch detection

1 0

[fedora-extras-commits] test
by fedora-extras-commits＠redhat.com 09 Nov '04

09 Nov '04

test email test

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

scm-commits November 2004