rpms/arts/F-7 arts-1.5.8-glibc.patch, NONE, 1.1 .cvsignore, 1.29, 1.30 arts.spec, 1.74, 1.75 gslconfig-wrapper.h, 1.1, 1.2 sources, 1.32, 1.33 arts-1.4.0-glibc.patch, 1.1, NONE arts-1.5.5-kde#139445.patch, 1.1, NONE arts-1.5.7-qtmcop-notifications-on-demand.patch, 1.1, NONE
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Wed Oct 24 13:40:32 UTC 2007
Author: rdieter
Update of /cvs/pkgs/rpms/arts/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4960
Modified Files:
.cvsignore arts.spec gslconfig-wrapper.h sources
Added Files:
arts-1.5.8-glibc.patch
Removed Files:
arts-1.4.0-glibc.patch arts-1.5.5-kde#139445.patch
arts-1.5.7-qtmcop-notifications-on-demand.patch
Log Message:
sync w/devel for arts-1.5.8 (kde-3.5.8)
arts-1.5.8-glibc.patch:
--- NEW FILE arts-1.5.8-glibc.patch ---
diff -up arts-1.5.8/artsc/artsdsp.c.glibc arts-1.5.8/artsc/artsdsp.c
--- arts-1.5.8/artsc/artsdsp.c.glibc 2007-10-08 04:47:09.000000000 -0500
+++ arts-1.5.8/artsc/artsdsp.c 2007-10-12 11:44:41.000000000 -0500
@@ -203,7 +206,7 @@ static int is_sound_device(const char *p
return 0;
}
-int open (const char *pathname, int flags, ...)
+int (open) (const char *pathname, int flags, ...)
{
va_list args;
mode_t mode = 0;
@@ -594,7 +597,7 @@ ssize_t write (int fd, const void *buf,
return 0;
}
-ssize_t read (int fd, void *buf, size_t count)
+ssize_t (read) (int fd, void *buf, size_t count)
{
CHECK_INIT();
diff -up arts-1.5.8/artsc/stdioemu.c.glibc arts-1.5.8/artsc/stdioemu.c
--- arts-1.5.8/artsc/stdioemu.c.glibc 2005-09-10 03:13:34.000000000 -0500
+++ arts-1.5.8/artsc/stdioemu.c 2007-10-12 11:45:05.000000000 -0500
@@ -83,9 +86,9 @@ static FILE *fake_fopen(const char *path
if(*mptr == '+') open_mode |= 3; /* 3 = readwrite */
if(*mptr == 'a') open_mode |= 2; /* append -> write */
}
- if(open_mode == 1) fdc->fd = open(path,O_RDONLY,0666);
- if(open_mode == 2) fdc->fd = open(path,O_WRONLY,0666);
- if(open_mode == 3) fdc->fd = open(path,O_RDWR,0666);
+ if(open_mode == 1) fdc->fd = (open)(path,O_RDONLY,0666);
+ if(open_mode == 2) fdc->fd = (open)(path,O_WRONLY,0666);
+ if(open_mode == 3) fdc->fd = (open)(path,O_RDWR,0666);
if(open_mode && fdc->fd > 0)
{
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/arts/F-7/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore 4 Jun 2007 15:20:26 -0000 1.29
+++ .cvsignore 24 Oct 2007 13:39:59 -0000 1.30
@@ -13,3 +13,4 @@
arts-1.5.4.tar.bz2
arts-1.5.6.tar.bz2
arts-1.5.7.tar.bz2
+arts-1.5.8.tar.bz2
Index: arts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/arts/F-7/arts.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- arts.spec 11 Jun 2007 12:59:51 -0000 1.74
+++ arts.spec 24 Oct 2007 13:39:59 -0000 1.75
@@ -1,17 +1,18 @@
-%define multilib_arches %{ix86} ia64 ppc ppc64 s390 s390x x86_64
+
+%define multilib_arches i386 x86_64 ppc ppc64 s390 s390x sparc sparc64
%define final 1
%define qt_version 3.3.8
%define make_cvs 1
-Name: arts
+Name: arts
Summary: aRts (analog realtime synthesizer) - the KDE sound system
-Group: System Environment/Daemons
-Epoch: 8
-Version: 1.5.7
-Release: 1%{?dist}
+Group: System Environment/Daemons
+Epoch: 8
+Version: 1.5.8
+Release: 4%{?dist}
-License: LGPL
+License: LGPLv2+
Url: http://www.kde.org
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
@@ -20,23 +21,20 @@
Patch1: arts-1.1.4-debug.patch
Patch2: arts-1.3.92-glib2.patch
Patch5: arts-1.3.1-alsa.patch
-Patch6: arts-1.4.0-glibc.patch
+Patch6: arts-1.5.8-glibc.patch
Patch7: arts-1.5.0-check_tmp_dir.patch
Patch8: arts-1.5.2-multilib.patch
-
+# kde#93359
+Patch50: arts-1.5.4-dlopenext.patch
+Patch51: kde-3.5-libtool-shlibext.patch
# upstream patches
-Patch100: arts-1.5.7-qtmcop-notifications-on-demand.patch
-Patch101: arts-1.5.4-dlopenext.patch
-Patch93359: kde-3.5-libtool-shlibext.patch
-# http://bugs.kde.org/139445
-# http://cvs.pld-linux.org/cgi-bin/cvsweb/SOURCES/arts-extension_loader.patch?rev=1.2
-#Patch139445: arts-extension_loader.patch
-Patch139445: arts-1.5.5-kde#139445.patch
-#BuildRequires: boost-devel
-BuildRequires: qt-devel >= 1:%{qt_version}
+# used in artsdsp
+Requires: which
+
+BuildRequires: qt-devel
## Shouldn't be necessary, but some folks won't upgrade, unless we stiff-arm them. (-;
-#global qt_ver %(pkg-config qt-mt --modversion 2>/dev/null || echo 3.3)
+#global qt_ver %(pkg-config qt-mt --modversion 2>/dev/null || echo %{qt_version})
#Requires: qt >= 1:%{qt_ver}
BuildRequires: alsa-lib-devel
BuildRequires: glib2-devel
@@ -65,23 +63,26 @@
tasks like simulating a mixer, generating an instrument or things like
playing a wave file with some effects.
-
%package devel
Group: Development/Libraries
Summary: Development files for the aRts sound server
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: qt-devel
Requires: pkgconfig
-## those below can/should be omitted from future builds -- Rex
-Requires: esound-devel
Requires: glib2-devel
+## those below can/should be omitted from future(f8?) builds -- Rex
+%if 0
+Requires: esound-devel
Requires: libvorbis-devel
Requires: audiofile-devel
Requires: alsa-lib-devel
+%endif
+
%description devel
Install arts-devel if you intend to write applications using arts (such as
KDE applications using sound).
+
%prep
%setup -q
%patch1 -p1 -b .debug
@@ -91,11 +92,8 @@
%patch7 -p1 -b .check_tmp_dir
%patch8 -p1 -b .multilib
-# upstream patches
-%patch100 -p0 -b .qtmcop-notifications-on-demand
-#patch93359 -p1 -b .libtool-shlibext
-#patch101 -p1 -b .dlopenext
-#patch139445 -p1 -b .kde#139445
+%patch50 -p1 -b .dlopenext
+%patch51 -p1 -b .libtool-shlibext
%if %{make_cvs}
make -f admin/Makefile.common cvs
@@ -116,6 +114,9 @@
--enable-final
%endif
+## hack for artsdsp (see http://bugzilla.redhat.com/329671)
+#make %{?_smp_mflags} -k || \
+# sed -i -e "s|-Wp,-D_FORTIFY_SOURCE=2||" artsc/Makefile && \
make %{?_smp_mflags}
@@ -123,13 +124,13 @@
rm -rf %{buildroot}
export PATH=`pwd`:$PATH
-make DESTDIR=%{buildroot} install
+make install DESTDIR=%{buildroot}
%ifarch %{multilib_arches}
# Ugly hack to allow parallel installation of 32-bit and 64-bit arts-devel
mv %{buildroot}%{_includedir}/kde/arts/gsl/gslconfig.h \
%{buildroot}%{_includedir}/kde/arts/gsl/gslconfig-%{_arch}.h
- install -c -m644 %{SOURCE1} %{buildroot}%{_includedir}/kde/arts/gsl/gslconfig.h
+ install -p -m644 %{SOURCE1} %{buildroot}%{_includedir}/kde/arts/gsl/gslconfig.h
%endif
## remove references to optional external libraries in .la files (#178733)
@@ -159,19 +160,22 @@
%clean
rm -rf %{buildroot}
+
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
+
%files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
+%doc COPYING.LIB
%dir %{_libdir}/mcop
%dir %{_libdir}/mcop/Arts
%{_libdir}/mcop/Arts/*
%{_libdir}/mcop/*.mcopclass
%{_libdir}/mcop/*.mcoptype
%{_libdir}/lib*.so.*
-%{_libdir}/*.la
+%{_libdir}/lib*.la
%{_bindir}/artscat
%{_bindir}/artsd
%{_bindir}/artsdsp
@@ -181,17 +185,49 @@
%{_bindir}/artswrapper
%files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
%{_bindir}/mcopidl
-%{_includedir}/kde/arts
-%{_includedir}/kde/artsc
+%dir %{_includedir}/kde
+%{_includedir}/kde/arts/
+%{_includedir}/kde/artsc/
%{_bindir}/artsc-config
%{_libdir}/pkgconfig/artsc.pc
%{_libdir}/lib*.so
%changelog
-* Mon Jun 04 2007 Than Ngo <than at redhat.com> - 6:1.5.7-1.fc7
+* Wed Oct 17 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 8:1.5.8-4
+- remove arts/open workaround (#329671)
+
+* Mon Oct 15 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 8:1.5.8-3
+- -devel: +Requires: glib2-devel (#331841)
+
+* Fri Oct 12 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 8:1.5.8-2
+- hack to get artsdsp buildable (#329671)
+
+* Fri Oct 12 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 8:1.5.8-1
+- 1.5.8 (kde-3.5.8)
+
+* Mon Oct 01 2007 Than Ngo <than at redhat.com> - 8:1.5.7-7
+- rh#312621, requires which
+
+* Fri Aug 02 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 8:1.5.7-6
+- update glibc patch ( open -> (open) )
+
+* Fri Aug 02 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 8:1.5.7-5
+- omit extention_loader patch (for now anyway), removes boost dep
+- License: LGPLv2+
+
+* Wed Jun 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 8:1.5.7-4
+- own %%_includedir/kde (#245909)
+
+* Wed Jun 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 8:1.5.7-3
+- cleanup gslconfig.h/multilib bits, -ia64, +sparc64/sparc
+
+* Mon Jun 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 8:1.5.7-2
+- (re)add (experimental) libtool patches
+
+* Mon Jun 04 2007 Than Ngo <than at redhat.com> - 8:1.5.7-1.fc7
- 1.5.7
* Tue May 15 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:1.5.6-4
Index: gslconfig-wrapper.h
===================================================================
RCS file: /cvs/pkgs/rpms/arts/F-7/gslconfig-wrapper.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gslconfig-wrapper.h 15 May 2006 17:04:03 -0000 1.1
+++ gslconfig-wrapper.h 24 Oct 2007 13:39:59 -0000 1.2
@@ -3,10 +3,10 @@
*
* DO NOT INCLUDE THE NEW FILE DIRECTLY -- ALWAYS INCLUDE THIS ONE INSTEAD. */
-#if defined(__i386__)
+#if defined(__x86_64__)
+#include "gslconfig-x86_64.h"
+#elif defined(__i386__)
#include "gslconfig-i386.h"
-#elif defined(__ia64__)
-#include "gslconfig-ia64.h"
#elif defined(__powerpc64__)
#include "gslconfig-ppc64.h"
#elif defined(__powerpc__)
@@ -15,8 +15,10 @@
#include "gslconfig-s390x.h"
#elif defined(__s390__)
#include "gslconfig-s390.h"
-#elif defined(__x86_64__)
-#include "gslconfig-x86_64.h"
+#elif defined(__sparc64__)
+#include "gslconfig-sparc64.h"
+#elif defined(__sparc__)
+#include "gslconfig-sparc.h"
#else
#error "This arts-devel package does not work your architecture?"
#endif
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/arts/F-7/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources 4 Jun 2007 15:20:26 -0000 1.32
+++ sources 24 Oct 2007 13:39:59 -0000 1.33
@@ -1 +1 @@
-28ac10541e5d8daf9009f6af1f7857af arts-1.5.7.tar.bz2
+061ce49351d970a81f4c0a1b0339fb34 arts-1.5.8.tar.bz2
--- arts-1.4.0-glibc.patch DELETED ---
--- arts-1.5.5-kde#139445.patch DELETED ---
--- arts-1.5.7-qtmcop-notifications-on-demand.patch DELETED ---
More information about the scm-commits
mailing list