rpms/gcdmaster/devel .cvsignore, 1.2, 1.3 gcdmaster.spec, 1.5, 1.6 sources, 1.2, 1.3 gcdmaster-1.2.1-qualification.patch, 1.1, NONE

[Denis Leroy (denis)]

Author: denis

Update of /cvs/extras/rpms/gcdmaster/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7246

Modified Files:
	.cvsignore gcdmaster.spec sources 
Removed Files:
	gcdmaster-1.2.1-qualification.patch 
Log Message:
- Update to 1.2.2, g++4 patch integrated upstream
- Removed makeinstall macro
- Added mime types to desktop file




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcdmaster/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 Dec 2005 20:12:52 -0000	1.2
+++ .cvsignore	9 Oct 2006 14:50:27 -0000	1.3
@@ -1 +1 @@
-cdrdao-1.2.1.tar.bz2
+cdrdao-1.2.2.tar.bz2


Index: gcdmaster.spec
===================================================================
RCS file: /cvs/extras/rpms/gcdmaster/devel/gcdmaster.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gcdmaster.spec	28 Aug 2006 15:08:16 -0000	1.5
+++ gcdmaster.spec	9 Oct 2006 14:50:27 -0000	1.6
@@ -1,17 +1,16 @@
-Name:		gcdmaster
-Version:	1.2.1
-Release:        7%{?dist}
-Summary:	A Gnome2 Disk-At-Once (DAO) Audio CD writer
+Name:           gcdmaster
+Version:        1.2.2
+Release:        1%{?dist}
+Summary:        A Gnome2 Disk-At-Once (DAO) Audio CD writer
 
-Group:		Applications/Multimedia
-License:	GPL
+Group:          Applications/Multimedia
+License:        GPL
 URL:            http://cdrdao.sourceforge.net/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0:	http://easynews.dl.sourceforge.net/sourceforge/cdrdao/cdrdao-%{version}.tar.bz2
-Patch0:         gcdmaster-1.2.1-qualification.patch
+Source0:        http://easynews.dl.sourceforge.net/sourceforge/cdrdao/cdrdao-%{version}.tar.bz2
 Requires:       cdrdao
-BuildRequires:	gtkmm24-devel
-BuildRequires:	libgnomeuimm26-devel
+BuildRequires:  gtkmm24-devel
+BuildRequires:  libgnomeuimm26-devel
 BuildRequires:  libsigc++20-devel
 BuildRequires:  libvorbis-devel >= 1.0
 BuildRequires:  desktop-file-utils
@@ -29,7 +28,7 @@
 
 %prep
 %setup -q -n cdrdao-%{version}
-%patch0 -p1 -b .qualification
+
 
 %build
 %configure --with-scglib=sys %{!?_with_mp3: --without-mp3-support}
@@ -38,7 +37,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 rm -f $RPM_BUILD_ROOT%{_bindir}/cdrdao
 rm -f $RPM_BUILD_ROOT%{_bindir}/*toc*
 rm -f $RPM_BUILD_ROOT%{_mandir}/man1/cdrdao*
@@ -46,6 +45,10 @@
 rm -fr $RPM_BUILD_ROOT%{_datadir}/cdrdao 
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 
+cat << EOF >> ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
+MimeType=application/x-toc;application/x-cue;application/x-cdrdao-toc;
+EOF
+
 desktop-file-install \
   --vendor fedora \
   --mode 644 \
@@ -82,6 +85,11 @@
 %{_mandir}/man1/gcdmaster*
 
 %changelog
+* Mon Oct  9 2006 Denis Leroy <denis at poolshark.org> - 1.2.2-1
+- Update to 1.2.2, g++4 patch integrated upstream
+- Removed makeinstall macro
+- Added mime types to desktop file
+
 * Mon Aug 28 2006 Denis Leroy <denis at poolshark.org> - 1.2.1-7
 - FE6 Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcdmaster/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Dec 2005 20:12:52 -0000	1.2
+++ sources	9 Oct 2006 14:50:27 -0000	1.3
@@ -1 +1 @@
-f93f3e68ec5b53ec1a776df73a1def60  cdrdao-1.2.1.tar.bz2
+f0cbf36907406cb4f4c568f9e6669a34  cdrdao-1.2.2.tar.bz2


--- gcdmaster-1.2.1-qualification.patch DELETED ---