rpms/cdrdao/devel cdrdao-1.2.2-desktop.patch, NONE, 1.1 cdrdao-1.2.2-gcc44.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 cdrdao.spec, 1.44, 1.45 sources, 1.9, 1.10 cdrdao-1.1.7-endianness.patch, 1.3, NONE cdrdao-1.2.2-gcc43.patch, 1.1, NONE cdrtools-2.0-O_EXCL.patch, 1.1, NONE cdrtools-2.01a27-silly-warnings.patch, 1.1, NONE mkisofs-changelog.patch, 1.1, NONE xcdrdao.desktop, 1.1, NONE
Denis Leroy
denis at fedoraproject.org
Tue Apr 7 07:36:48 UTC 2009
Author: denis
Update of /cvs/pkgs/rpms/cdrdao/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3815
Modified Files:
.cvsignore cdrdao.spec sources
Added Files:
cdrdao-1.2.2-desktop.patch cdrdao-1.2.2-gcc44.patch
Removed Files:
cdrdao-1.1.7-endianness.patch cdrdao-1.2.2-gcc43.patch
cdrtools-2.0-O_EXCL.patch
cdrtools-2.01a27-silly-warnings.patch mkisofs-changelog.patch
xcdrdao.desktop
Log Message:
- Update to latest 1.2.3 release candidate
- Merged with gcdmaster spec file
- Added scripts to manage gcdmaster new schemas file
- Moved desktop file fix into patch
- Added patch to fix gcc 4.4 compile
cdrdao-1.2.2-desktop.patch:
--- NEW FILE cdrdao-1.2.2-desktop.patch ---
--- cdrdao-1.2.3rc2/xdao/gcdmaster.desktop~ 2004-06-28 20:05:57.000000000 +0200
+++ cdrdao-1.2.3rc2/xdao/gcdmaster.desktop 2009-04-07 09:13:56.000000000 +0200
@@ -1,10 +1,10 @@
[Desktop Entry]
-Encoding=UTF-8
Name=Gnome CD Master
Comment=Gnome Audio CD editor and burner
Exec=gcdmaster %F
-Icon=gcdmaster.png
+Icon=gcdmaster
Terminal=false
Type=Application
StartupNotify=true
-Categories=GNOME;AudioVideo;Application;X-Fedora;
+Categories=GNOME;AudioVideo;X-Fedora;
+MimeType=application/x-toc;application/x-cue;application/x-cdrdao-toc;
cdrdao-1.2.2-gcc44.patch:
--- NEW FILE cdrdao-1.2.2-gcc44.patch ---
--- cdrdao-1.2.3rc2/trackdb/TempFileManager.cc~ 2008-02-17 14:05:05.000000000 +0100
+++ cdrdao-1.2.3rc2/trackdb/TempFileManager.cc 2009-04-07 09:05:41.000000000 +0200
@@ -20,6 +20,7 @@
#include "TempFileManager.h"
#include "log.h"
+#include <stdio.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
--- cdrdao-1.2.3rc2/dao/CdrDriver.cc~ 2009-02-21 11:01:32.000000000 +0100
+++ cdrdao-1.2.3rc2/dao/CdrDriver.cc 2009-04-07 09:07:14.000000000 +0200
@@ -2114,8 +2114,8 @@
ret = 1;
}
else {
- if ((caps & CDR_READ_CAP_DATA_RW_RAW|CDR_READ_CAP_DATA_PW_RAW) != 0)
- ret = 1;
+ if ((caps & (CDR_READ_CAP_DATA_RW_RAW|CDR_READ_CAP_DATA_PW_RAW)) != 0)
+ ret = 1;
}
break;
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cdrdao/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 24 Jan 2007 13:49:24 -0000 1.9
+++ .cvsignore 7 Apr 2009 07:36:18 -0000 1.10
@@ -1 +1 @@
-cdrdao-1.2.2.tar.bz2
+cdrdao-1.2.3rc2.tar.bz2
Index: cdrdao.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cdrdao/devel/cdrdao.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- cdrdao.spec 24 Feb 2009 06:53:21 -0000 1.44
+++ cdrdao.spec 7 Apr 2009 07:36:18 -0000 1.45
@@ -1,28 +1,28 @@
-Summary: Writes audio CD-Rs in disk-at-once (DAO) mode
-Name: cdrdao
-Version: 1.2.2
-Release: 6
-License: GPLv2
-Group: Applications/Multimedia
-URL: http://cdrdao.sourceforge.net/
-Source: http://easynews.dl.sourceforge.net/sourceforge/cdrdao/%{name}-%{version}.tar.bz2
-
-Patch1: mkisofs-changelog.patch
-Patch2: cdrdao-1.2.2-gcc43.patch
-Patch9: cdrdao-1.1.7-endianness.patch
-Patch23: cdrtools-2.01a27-silly-warnings.patch
-Patch30: cdrtools-2.0-O_EXCL.patch
+%define rcversion rc2
+Summary: Writes audio CD-Rs in disk-at-once (DAO) mode
+Name: cdrdao
+Version: 1.2.3
+Release: 0.%{rcversion}.1
+License: GPLv2
+Group: Applications/Multimedia
+URL: http://cdrdao.sourceforge.net/
+Source0: %{name}-%{version}%{rcversion}.tar.bz2
+Patch0: cdrdao-1.2.2-gcc44.patch
+Patch1: cdrdao-1.2.2-desktop.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# Only for gcdmaster
-#BuildRequires: libvorbis-devel >= 1.0
-
-BuildRequires: libpng-devel
+BuildRequires: gtkmm24-devel
+BuildRequires: libgnomeuimm26-devel
+BuildRequires: libsigc++20-devel
+BuildRequires: libvorbis-devel >= 1.0
+BuildRequires: desktop-file-utils
+BuildRequires: libao-devel
# Only exclude s390
ExcludeArch: s390 s390x
+
%description
Cdrdao records audio CD-Rs in disk-at-once (DAO) mode, based on a
textual description of the CD contents. Recording in DAO mode writes
@@ -30,38 +30,117 @@
single step. DAO allows full control over the length and the contents
of pre-gaps, the pause areas between tracks.
+
+%package -n gcdmaster
+Summary: A Gnome2 Disk-At-Once (DAO) Audio CD writer
+Group: Applications/Multimedia
+Requires: cdrdao = %{version}-%{release}
+
+Requires(post): shared-mime-info desktop-file-utils
+Requires(postun): shared-mime-info desktop-file-utils
+Requires(pre): GConf2
+Requires(post): GConf2
+Requires(preun): GConf2
+
+
+%description -n gcdmaster
+Gcdmaster is a GNOME2 GUI front-end to cdrdao that makes it easy to
+visualize and manipulate audio information before burning it onto
+CD. Its features include: cut/copy/paste of sound samples, track marks
+edition and silence insertion.
+
+
%prep
-%setup -q
-chmod a+rX -R .
-%patch1 -p1 -b .changelog
-%patch2 -p1 -b .gcc43
-%patch9 -p1 -b .endian
-%patch23 -p1 -b .silly
-%patch30 -p1 -b .excl
+%setup -q -n %{name}-%{version}%{rcversion}
+%patch0 -p1 -b .gcc4
+%patch1 -p1 -b .desktop
+
%build
-%configure --prefix=%{_prefix}\
- --without-xdao --without-lame
+%configure \
+ --with-xdao \
+ --without-scglib \
+ --with-mp3-support \
+ --without-lame
make %{?_smp_mflags}
+
%install
rm -rf $RPM_BUILD_ROOT
-
make install DESTDIR=$RPM_BUILD_ROOT
+find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
+
+desktop-file-install \
+ --vendor "" \
+ --mode 644 \
+ --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+ --delete-original \
+ $RPM_BUILD_ROOT%{_datadir}/applications/gcdmaster.desktop
+
+
%clean
rm -rf $RPM_BUILD_ROOT
+
+%post -n gcdmaster
+update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gcdmaster.schemas > /dev/null || :
+killall -HUP gconfd-2 &>/dev/null || :
+
+
+%postun -n gcdmaster
+update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+if [ "$1" -gt 1 ]; then
+ export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+ gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/gcdmaster.schemas >/dev/null || :
+ killall -HUP gconfd-2 &>/dev/null || :
+fi
+
+
+%preun
+if [ "$1" -eq 0 ]; then
+ export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+ gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/gcdmaster.schemas > /dev/null || :
+ killall -HUP gconfd-2 &>/dev/null || :
+fi
+
+
%files
-%defattr(-,root,root)
-%doc COPYING README
-%{_bindir}/*
-%dir %{_datadir}/cdrdao
-%{_datadir}/cdrdao/*
-%{_mandir}/*/*
+%defattr(-, root, root, -)
+%doc AUTHORS COPYING README CREDITS ChangeLog
+%{_bindir}/cdrdao
+%{_bindir}/*toc*
+%{_datadir}/cdrdao
+%{_mandir}/*/cdrdao*
+%{_mandir}/*/cue2toc*
+
+
+%files -n gcdmaster
+%defattr(-, root, root, -)
+%{_bindir}/gcdmaster
+%{_datadir}/gcdmaster
+%{_datadir}/applications/*.desktop
+%{_datadir}/mime-info/gcdmaster*
+%{_datadir}/mime/packages/gcdmaster.xml
+%{_datadir}/application-registry/gcdmaster.applications
+%{_datadir}/pixmaps/*
+%{_sysconfdir}/gconf/schemas/gcdmaster.schemas
+%{_mandir}/man1/gcdmaster*
+
%changelog
+* Tue Apr 7 2009 Denis Leroy <denis at poolshark.org> - 1.2.3-0.rc2.1
+- Update to latest 1.2.3 release candidate
+- Merged with gcdmaster spec file
+- Added scripts to manage gcdmaster new schemas file
+- Moved desktop file fix into patch
+- Added patch to fix gcc 4.4 compile
+
* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.2-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cdrdao/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources 24 Jan 2007 13:49:24 -0000 1.9
+++ sources 7 Apr 2009 07:36:18 -0000 1.10
@@ -1 +1 @@
-f0cbf36907406cb4f4c568f9e6669a34 cdrdao-1.2.2.tar.bz2
+55966f60e88cbf82bad91f3accfdc50b cdrdao-1.2.3rc2.tar.bz2
--- cdrdao-1.1.7-endianness.patch DELETED ---
--- cdrdao-1.2.2-gcc43.patch DELETED ---
--- cdrtools-2.0-O_EXCL.patch DELETED ---
--- cdrtools-2.01a27-silly-warnings.patch DELETED ---
--- mkisofs-changelog.patch DELETED ---
--- xcdrdao.desktop DELETED ---
More information about the scm-commits
mailing list