rpms/audacity-freeworld/F-14 audacity-1.3.13-desktop.in.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 audacity-freeworld.spec, 1.19, 1.20 sources, 1.7, 1.8 audacity-1.3.10-desktop.patch, 1.1, NONE audacity-1.3.12-ffmpeg-0.6-apichange-av_match_ext.patch, 1.1, NONE audacity-1.3.12-ffmpeg-fix-ufile_write.patch, 1.1, NONE audacity-1.3.12-fix-minimum-playspeed.patch, 1.1, NONE audacity-1.3.12-portmixer-autoreconf.patch, 1.1, NONE audacity.desktop, 1.3, NONE audacity.png, 1.1, NONE
by David Timms
Author: dtimms
Update of /cvs/free/rpms/audacity-freeworld/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv15819
Modified Files:
.cvsignore audacity-freeworld.spec sources
Added Files:
audacity-1.3.13-desktop.in.patch
Removed Files:
audacity-1.3.10-desktop.patch
audacity-1.3.12-ffmpeg-0.6-apichange-av_match_ext.patch
audacity-1.3.12-ffmpeg-fix-ufile_write.patch
audacity-1.3.12-fix-minimum-playspeed.patch
audacity-1.3.12-portmixer-autoreconf.patch audacity.desktop
audacity.png
Log Message:
upgrade to 1.3.13-beta
drop patches included in upstream release
convert desktop file to a patch against new upstream .desktop file.
audacity-1.3.13-desktop.in.patch:
audacity.desktop.in | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
--- NEW FILE audacity-1.3.13-desktop.in.patch ---
--- src/audacity.desktop.in.orig 2011-04-07 09:35:51.000000000 +1000
+++ src/audacity.desktop.in 2011-04-24 23:03:04.226793699 +1000
@@ -5,16 +5,17 @@
GenericName=Sound Editor
GenericName[de]=Audio-Editor
GenericName[ru]=Редактор звуковых файлов
-Comment=Record and edit audio files
+Comment=Record and edit audio files with multitrack capability
Comment[de]=Audio-Dateien aufnehmen und bearbeiten
Comment[ru]=Запись и редактирование звуковых файлов
Icon=@AUDACITY_NAME@
Type=Application
-Categories=AudioVideo;Audio;AudioVideoEditing;
+Categories=AudioVideo;Audio;GTK;GNOME;Sequencer;X-Jack;AudioVideoEditing;
Exec=@AUDACITY_NAME@
-StartupNotify=false
+StartupNotify=true
+StartupWMClass=Audacity
Terminal=false
-MimeType=application/ogg;audio/basic;audio/mpeg;audio/x-aiff;audio/x-mp3;audio/x-wav;application/x-audacity-project;
+MimeType=application/ogg;audio/basic;audio/mpeg;audio/x-aiff;audio/x-aiffc;audio/x-aifc;audio/x-mp3;audio/x-wav;application/x-audacity-project;audio/midi;audio/x-flac;
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/audacity-freeworld/F-14/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore 27 Jun 2010 14:41:58 -0000 1.7
+++ .cvsignore 26 Apr 2011 22:18:26 -0000 1.8
@@ -1 +1 @@
-audacity-minsrc-1.3.12-beta.tar.bz2
+audacity-minsrc-1.3.13-beta.tar.bz2
Index: audacity-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/audacity-freeworld/F-14/audacity-freeworld.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- audacity-freeworld.spec 10 Nov 2010 11:52:16 -0000 1.19
+++ audacity-freeworld.spec 26 Apr 2011 22:18:27 -0000 1.20
@@ -1,7 +1,7 @@
Name: audacity-freeworld
-Version: 1.3.12
-Release: 0.11.beta%{?dist}
+Version: 1.3.13
+Release: 0.2.beta%{?dist}
Summary: Multitrack audio editor
Group: Applications/Multimedia
License: GPLv2
@@ -12,8 +12,6 @@
Conflicts: %{realname}
Source0: http://downloads.sf.net/sourceforge/audacity/audacity-minsrc-%{version}-b...
-Source1: audacity.png
-Source2: audacity.desktop
Patch1: audacity-1.3.7-libmp3lame-default.patch
Patch2: audacity-1.3.9-libdir.patch
@@ -21,12 +19,7 @@
# remove audio/mpeg, audio/x-mp3
# enable startup notification
# add categories Sequencer X-Jack AudioVideoEditing for F-12 Studio feature
-Patch3: audacity-1.3.10-desktop.patch
-# ffmpeg-0.6: utils.c changed match_ext() to av_match_ext().
-Patch4: audacity-1.3.12-ffmpeg-0.6-apichange-av_match_ext.patch
-Patch7: audacity-1.3.12-fix-minimum-playspeed.patch
-Patch8: audacity-1.3.12-portmixer-autoreconf.patch
-Patch9: audacity-1.3.12-ffmpeg-fix-ufile_write.patch
+Patch3: audacity-1.3.13-desktop.in.patch
Provides: audacity-nonfree = %{version}-%{release}
Obsoletes: audacity-nonfree < %{version}-%{release}
@@ -72,8 +65,8 @@
%setup -q -n %{tartopdir}
# Substitute hardcoded library paths.
-%patch1 -p1
-%patch2 -p1
+%patch1 -p1 -b .libmp3lame-default
+%patch2 -p1 -b .libdir
for i in src/effects/ladspa/LoadLadspa.cpp src/AudacityApp.cpp src/export/ExportMP3.cpp
do
sed -i -e 's!__RPM_LIBDIR__!%{_libdir}!g' $i
@@ -81,20 +74,14 @@
done
grep -q -s __RPM_LIB * -R && exit 1
-%patch3 -p1 -b .old-desktop-file
-%patch4 -p1 -b .ffmpeg-0.6-apichange-av_match_ext
-
-%patch7 -p1 -b .fix-minimum-playspeed
-%patch8 -p1 -b .portmixer-autoreconf-from-svn
-%patch9 -p1 -b .ffmpeg-from-svn
-
-
# Substitute occurences of "libmp3lame.so" with "libmp3lame.so.0".
for i in locale/*.po src/export/ExportMP3.cpp
do
sed -i -e 's!libmp3lame.so\([^.]\)!libmp3lame.so.0\1!g' $i
done
+%patch3 -b .desktop.old
+
%build
%configure \
@@ -117,9 +104,6 @@
%install
rm -rf ${RPM_BUILD_ROOT}
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
-cp %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/pixmaps
-
make DESTDIR=${RPM_BUILD_ROOT} install
# Audacity 1.3.8-beta complains if the help/manual directories
@@ -130,8 +114,8 @@
desktop-file-install \
--vendor fedora \
- --dir $RPM_BUILD_ROOT%{_datadir}/applications \
--delete-original \
+ --dir $RPM_BUILD_ROOT%{_datadir}/applications \
$RPM_BUILD_ROOT%{_datadir}/applications/audacity.desktop
@@ -164,6 +148,14 @@
%changelog
+* Tue Apr 26 2011 David Timms <iinet.net.au@dtimms> - 1.3.13-0.2.beta
+- delete help file Source reference; will be done in Fedora instead.
+
+* Sun Apr 24 2011 David Timms <iinet.net.au@dtimms> - 1.3.13-0.2.beta
+- upgrade to 1.3.13-beta
+- drop patches included in upstream release
+- convert desktop file to a patch against new upstream .desktop file.
+
* Wed Nov 10 2010 David Timms <iinet.net.au@dtimms> - 1.3.12-0.11.beta
- fix build failure compiling ffmpeg.cpp
Index: sources
===================================================================
RCS file: /cvs/free/rpms/audacity-freeworld/F-14/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources 27 Jun 2010 14:41:58 -0000 1.7
+++ sources 26 Apr 2011 22:18:28 -0000 1.8
@@ -1 +1 @@
-76996fec67181ca82ba191e012518b57 audacity-minsrc-1.3.12-beta.tar.bz2
+57be7fadb8c8dd17b8462c7ac1561d03 audacity-minsrc-1.3.13-beta.tar.bz2
--- audacity-1.3.10-desktop.patch DELETED ---
--- audacity-1.3.12-ffmpeg-0.6-apichange-av_match_ext.patch DELETED ---
--- audacity-1.3.12-ffmpeg-fix-ufile_write.patch DELETED ---
--- audacity-1.3.12-fix-minimum-playspeed.patch DELETED ---
--- audacity-1.3.12-portmixer-autoreconf.patch DELETED ---
--- audacity.desktop DELETED ---
13 years
rpms/phonon-backend-vlc/F-14 .cvsignore, 1.2, 1.3 phonon-backend-vlc.spec, 1.1, 1.2 sources, 1.2, 1.3
by Rex Dieter
Author: rdieter
Update of /cvs/free/rpms/phonon-backend-vlc/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv25703
Modified Files:
.cvsignore phonon-backend-vlc.spec sources
Log Message:
sync w/devel
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/phonon-backend-vlc/F-14/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 29 Sep 2010 14:14:30 -0000 1.2
+++ .cvsignore 26 Apr 2011 17:15:25 -0000 1.3
@@ -1 +1 @@
-phonon-backend-vlc-0.2.0.tar.gz
+phonon-backend-vlc-0.4.0.tar.bz2
Index: phonon-backend-vlc.spec
===================================================================
RCS file: /cvs/free/rpms/phonon-backend-vlc/F-14/phonon-backend-vlc.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- phonon-backend-vlc.spec 29 Sep 2010 14:14:30 -0000 1.1
+++ phonon-backend-vlc.spec 26 Apr 2011 17:15:25 -0000 1.2
@@ -1,29 +1,30 @@
-#define snap 20100701
-
name: phonon-backend-vlc
Summary: VLC phonon backend
-Version: 0.2.0
-Release: 2%{?dist}
+Version: 0.4.0
+Release: 1%{?dist}
Group: Applications/Multimedia
License: LGPLv2+
URL: http://phonon.kde.org/
-Source0: ftp://ftp.kde.org/pub/kde/stable/phonon-backend-vlc/%{version}/src/phonon...
-#git clone git://gitorious.org/phonon/phonon-vlc.git
-# git archive --prefix=phonon-backend-vlc-0.2.0/ master | bzip2 > phonon-vlc-0.2-%{snap}.tar.bz2
-#Source0: phonon-vlc-%{version}-%{snap}.tar.bz2
+%if 0%{?snap}
+# git clone git://gitorious.org/phonon/phonon-vlc.git
+# git archive --prefix=phonon-backend-vlc-%{version}/ master | bzip2 > phonon-vlc-%{version}-%{snap}.tar.bz2
+Source0: phonon-vlc-%{version}-%{snap}.tar.bz2
+%else
+Source0: ftp://ftp.kde.org/pub/kde/stable/phonon/phonon-backend-vlc/%{version}/src...
+%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: automoc4 >= 0.9.86
BuildRequires: cmake >= 2.6.0
-BuildRequires: phonon-devel >= 4.4.2
+BuildRequires: phonon-devel >= 4.5.0
BuildRequires: kde-filesystem
BuildRequires: libxcb-devel
BuildRequires: libxml2-devel
BuildRequires: qt4-devel
BuildRequires: vlc-devel >= 1.1.1
-%global phonon_ver %(pkg-config --modversion phonon 2>/dev/null || echo 4.4.0)
+%global phonon_ver %(pkg-config --modversion phonon 2>/dev/null || echo 4.5.0)
%global vlc_ver %(pkg-config --modversion libvlc 2>/dev/null || echo 1.1.0)
Provides: phonon-backend%{?_isa} = %{phonon_ver}
@@ -71,6 +72,15 @@
%changelog
+* Tue Apr 26 2011 Rex Dieter <rdieter(a)fedoraproject.org> - 0.4.0-1
+- 0.4.0
+
+* Wed Dec 01 2010 Rex Dieter <rdieter(a)fedoraproject.org> - 0.3.1-1
+- 0.3.1
+
+* Tue Nov 30 2010 Rex Dieter <rdieter(a)fedoraproject.org> - 0.3.0-1
+- 0.3.0
+
* Sat Sep 11 2010 Rex Dieter <rdieter(a)fedoraproject.org> - 0.2.0-2
- %%doc AUTHORS COPYING.LIB
- drop BR: pkgconfig
Index: sources
===================================================================
RCS file: /cvs/free/rpms/phonon-backend-vlc/F-14/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 29 Sep 2010 14:14:30 -0000 1.2
+++ sources 26 Apr 2011 17:15:25 -0000 1.3
@@ -1 +1 @@
-33a1ca367989e306507ea633c99b8df5 phonon-backend-vlc-0.2.0.tar.gz
+e6ef8c5b54a49610d4dad67754392420 phonon-backend-vlc-0.4.0.tar.bz2
13 years
rpms/phonon-backend-vlc/devel phonon-backend-vlc.spec,1.5,1.6
by Rex Dieter
Author: rdieter
Update of /cvs/free/rpms/phonon-backend-vlc/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv25626
Modified Files:
phonon-backend-vlc.spec
Log Message:
phonon min version 4.5.0
Index: phonon-backend-vlc.spec
===================================================================
RCS file: /cvs/free/rpms/phonon-backend-vlc/devel/phonon-backend-vlc.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- phonon-backend-vlc.spec 26 Apr 2011 17:13:34 -0000 1.5
+++ phonon-backend-vlc.spec 26 Apr 2011 17:14:45 -0000 1.6
@@ -24,7 +24,7 @@
BuildRequires: qt4-devel
BuildRequires: vlc-devel >= 1.1.1
-%global phonon_ver %(pkg-config --modversion phonon 2>/dev/null || echo 4.4.3)
+%global phonon_ver %(pkg-config --modversion phonon 2>/dev/null || echo 4.5.0)
%global vlc_ver %(pkg-config --modversion libvlc 2>/dev/null || echo 1.1.0)
Provides: phonon-backend%{?_isa} = %{phonon_ver}
13 years
rpms/phonon-backend-vlc/devel .cvsignore, 1.4, 1.5 phonon-backend-vlc.spec, 1.4, 1.5 sources, 1.4, 1.5
by Rex Dieter
Author: rdieter
Update of /cvs/free/rpms/phonon-backend-vlc/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv25197
Modified Files:
.cvsignore phonon-backend-vlc.spec sources
Log Message:
* Tue Apr 26 2011 Rex Dieter <rdieter(a)fedoraproject.org> - 0.4.0-1
- 0.4.0
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/phonon-backend-vlc/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 1 Dec 2010 15:58:00 -0000 1.4
+++ .cvsignore 26 Apr 2011 17:13:34 -0000 1.5
@@ -1 +1 @@
-phonon-backend-vlc-0.3.1.tar.bz2
+phonon-backend-vlc-0.4.0.tar.bz2
Index: phonon-backend-vlc.spec
===================================================================
RCS file: /cvs/free/rpms/phonon-backend-vlc/devel/phonon-backend-vlc.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- phonon-backend-vlc.spec 1 Dec 2010 15:58:23 -0000 1.4
+++ phonon-backend-vlc.spec 26 Apr 2011 17:13:34 -0000 1.5
@@ -1,7 +1,7 @@
name: phonon-backend-vlc
Summary: VLC phonon backend
-Version: 0.3.1
+Version: 0.4.0
Release: 1%{?dist}
Group: Applications/Multimedia
License: LGPLv2+
@@ -11,13 +11,13 @@
# git archive --prefix=phonon-backend-vlc-%{version}/ master | bzip2 > phonon-vlc-%{version}-%{snap}.tar.bz2
Source0: phonon-vlc-%{version}-%{snap}.tar.bz2
%else
-Source0: ftp://ftp.kde.org/pub/kde/stable/phonon-backend-vlc/%{version}/src/phonon...
+Source0: ftp://ftp.kde.org/pub/kde/stable/phonon/phonon-backend-vlc/%{version}/src...
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: automoc4 >= 0.9.86
BuildRequires: cmake >= 2.6.0
-BuildRequires: phonon-devel >= 4.4.3
+BuildRequires: phonon-devel >= 4.5.0
BuildRequires: kde-filesystem
BuildRequires: libxcb-devel
BuildRequires: libxml2-devel
@@ -72,6 +72,9 @@
%changelog
+* Tue Apr 26 2011 Rex Dieter <rdieter(a)fedoraproject.org> - 0.4.0-1
+- 0.4.0
+
* Wed Dec 01 2010 Rex Dieter <rdieter(a)fedoraproject.org> - 0.3.1-1
- 0.3.1
Index: sources
===================================================================
RCS file: /cvs/free/rpms/phonon-backend-vlc/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 1 Dec 2010 15:58:00 -0000 1.4
+++ sources 26 Apr 2011 17:13:35 -0000 1.5
@@ -1 +1 @@
-c080daa48353516d80ab529635b7c172 phonon-backend-vlc-0.3.1.tar.bz2
+e6ef8c5b54a49610d4dad67754392420 phonon-backend-vlc-0.4.0.tar.bz2
13 years
rpms/audacity-freeworld/devel audacity-freeworld.spec,1.16,1.17
by David Timms
Author: dtimms
Update of /cvs/free/rpms/audacity-freeworld/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv5488
Modified Files:
audacity-freeworld.spec
Log Message:
delete help file Source reference; will be done in Fedora instead
Index: audacity-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/audacity-freeworld/devel/audacity-freeworld.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- audacity-freeworld.spec 26 Apr 2011 13:20:06 -0000 1.16
+++ audacity-freeworld.spec 26 Apr 2011 13:32:05 -0000 1.17
@@ -1,7 +1,7 @@
Name: audacity-freeworld
Version: 1.3.13
-Release: 0.1.beta%{?dist}
+Release: 0.2.beta%{?dist}
Summary: Multitrack audio editor
Group: Applications/Multimedia
License: GPLv2
@@ -12,7 +12,6 @@
Conflicts: %{realname}
Source0: http://downloads.sf.net/sourceforge/audacity/audacity-minsrc-%{version}-b...
-Source1: http://manual.audacityteam.org/help.zip
Patch1: audacity-1.3.7-libmp3lame-default.patch
Patch2: audacity-1.3.9-libdir.patch
@@ -149,7 +148,10 @@
%changelog
-* Sun Apr 24 2011 David Timms <iinet.net.au@dtimms> - 1.3.13-0.1.beta
+* Tue Apr 26 2011 David Timms <iinet.net.au@dtimms> - 1.3.13-0.2.beta
+- delete help file Source reference; will be done in Fedora instead.
+
+* Sun Apr 24 2011 David Timms <iinet.net.au@dtimms> - 1.3.13-0.2.beta
- upgrade to 1.3.13-beta
- drop patches included in upstream release
- convert desktop file to a patch against new upstream .desktop file.
13 years
rpms/audacity-freeworld/devel audacity-1.3.13-desktop.in.patch, NONE, 1.1
by David Timms
Author: dtimms
Update of /cvs/free/rpms/audacity-freeworld/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv4262
Added Files:
audacity-1.3.13-desktop.in.patch
Log Message:
add desktop file patch to include Fedora Studio changes
audacity-1.3.13-desktop.in.patch:
audacity.desktop.in | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
--- NEW FILE audacity-1.3.13-desktop.in.patch ---
--- src/audacity.desktop.in.orig 2011-04-07 09:35:51.000000000 +1000
+++ src/audacity.desktop.in 2011-04-24 23:03:04.226793699 +1000
@@ -5,16 +5,17 @@
GenericName=Sound Editor
GenericName[de]=Audio-Editor
GenericName[ru]=Редактор звуковых файлов
-Comment=Record and edit audio files
+Comment=Record and edit audio files with multitrack capability
Comment[de]=Audio-Dateien aufnehmen und bearbeiten
Comment[ru]=Запись и редактирование звуковых файлов
Icon=@AUDACITY_NAME@
Type=Application
-Categories=AudioVideo;Audio;AudioVideoEditing;
+Categories=AudioVideo;Audio;GTK;GNOME;Sequencer;X-Jack;AudioVideoEditing;
Exec=@AUDACITY_NAME@
-StartupNotify=false
+StartupNotify=true
+StartupWMClass=Audacity
Terminal=false
-MimeType=application/ogg;audio/basic;audio/mpeg;audio/x-aiff;audio/x-mp3;audio/x-wav;application/x-audacity-project;
+MimeType=application/ogg;audio/basic;audio/mpeg;audio/x-aiff;audio/x-aiffc;audio/x-aifc;audio/x-mp3;audio/x-wav;application/x-audacity-project;audio/midi;audio/x-flac;
13 years
rpms/audacity-freeworld/devel .cvsignore, 1.7, 1.8 audacity-freeworld.spec, 1.15, 1.16 sources, 1.7, 1.8 audacity-1.3.10-desktop.patch, 1.1, NONE audacity-1.3.12-ffmpeg-0.6-apichange-av_match_ext.patch, 1.1, NONE audacity.desktop, 1.3, NONE
by David Timms
Author: dtimms
Update of /cvs/free/rpms/audacity-freeworld/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3205
Modified Files:
.cvsignore audacity-freeworld.spec sources
Removed Files:
audacity-1.3.10-desktop.patch
audacity-1.3.12-ffmpeg-0.6-apichange-av_match_ext.patch
audacity.desktop
Log Message:
upgrade to 1.3.13-beta
drop patches included in upstream release
convert desktop file to a patch against new upstream .desktop file.
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/audacity-freeworld/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore 27 Jun 2010 14:41:58 -0000 1.7
+++ .cvsignore 26 Apr 2011 13:20:05 -0000 1.8
@@ -1 +1 @@
-audacity-minsrc-1.3.12-beta.tar.bz2
+audacity-minsrc-1.3.13-beta.tar.bz2
Index: audacity-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/audacity-freeworld/devel/audacity-freeworld.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- audacity-freeworld.spec 8 Aug 2010 22:00:23 -0000 1.15
+++ audacity-freeworld.spec 26 Apr 2011 13:20:06 -0000 1.16
@@ -1,7 +1,7 @@
Name: audacity-freeworld
-Version: 1.3.12
-Release: 0.7.beta%{?dist}
+Version: 1.3.13
+Release: 0.1.beta%{?dist}
Summary: Multitrack audio editor
Group: Applications/Multimedia
License: GPLv2
@@ -12,8 +12,7 @@
Conflicts: %{realname}
Source0: http://downloads.sf.net/sourceforge/audacity/audacity-minsrc-%{version}-b...
-Source1: audacity.png
-Source2: audacity.desktop
+Source1: http://manual.audacityteam.org/help.zip
Patch1: audacity-1.3.7-libmp3lame-default.patch
Patch2: audacity-1.3.9-libdir.patch
@@ -21,9 +20,7 @@
# remove audio/mpeg, audio/x-mp3
# enable startup notification
# add categories Sequencer X-Jack AudioVideoEditing for F-12 Studio feature
-Patch3: audacity-1.3.10-desktop.patch
-# ffmpeg-0.6: utils.c changed match_ext() to av_match_ext().
-Patch4: audacity-1.3.12-ffmpeg-0.6-apichange-av_match_ext.patch
+Patch3: audacity-1.3.13-desktop.in.patch
Provides: audacity-nonfree = %{version}-%{release}
Obsoletes: audacity-nonfree < %{version}-%{release}
@@ -69,8 +66,8 @@
%setup -q -n %{tartopdir}
# Substitute hardcoded library paths.
-%patch1 -p1
-%patch2 -p1
+%patch1 -p1 -b .libmp3lame-default
+%patch2 -p1 -b .libdir
for i in src/effects/ladspa/LoadLadspa.cpp src/AudacityApp.cpp src/export/ExportMP3.cpp
do
sed -i -e 's!__RPM_LIBDIR__!%{_libdir}!g' $i
@@ -78,15 +75,14 @@
done
grep -q -s __RPM_LIB * -R && exit 1
-%patch3 -p1 -b .old-desktop-file
-%patch4 -p1 -b .ffmpeg-0.6-apichange-av_match_ext
-
# Substitute occurences of "libmp3lame.so" with "libmp3lame.so.0".
for i in locale/*.po src/export/ExportMP3.cpp
do
sed -i -e 's!libmp3lame.so\([^.]\)!libmp3lame.so.0\1!g' $i
done
+%patch3 -b .desktop.old
+
%build
%configure \
@@ -109,9 +105,6 @@
%install
rm -rf ${RPM_BUILD_ROOT}
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
-cp %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/pixmaps
-
make DESTDIR=${RPM_BUILD_ROOT} install
# Audacity 1.3.8-beta complains if the help/manual directories
@@ -122,8 +115,8 @@
desktop-file-install \
--vendor fedora \
- --dir $RPM_BUILD_ROOT%{_datadir}/applications \
--delete-original \
+ --dir $RPM_BUILD_ROOT%{_datadir}/applications \
$RPM_BUILD_ROOT%{_datadir}/applications/audacity.desktop
@@ -156,6 +149,25 @@
%changelog
+* Sun Apr 24 2011 David Timms <iinet.net.au@dtimms> - 1.3.13-0.1.beta
+- upgrade to 1.3.13-beta
+- drop patches included in upstream release
+- convert desktop file to a patch against new upstream .desktop file.
+
+* Wed Nov 10 2010 David Timms <iinet.net.au@dtimms> - 1.3.12-0.11.beta
+- fix build failure compiling ffmpeg.cpp
+
+* Wed Nov 10 2010 David Timms <iinet.net.au@dtimms> - 1.3.12-0.10.beta
+- fix build failure in portmixer due to "Missing support in pa_mac_core.h"
+ Applied svn trunk portmixer configure changes.
+- del previous patch attempt (unsuccessful)
+
+* Mon Oct 31 2010 David Timms <iinet.net.au@dtimms> - 1.3.12-0.9.beta
+- fix build failure due to portmixer configure problems
+
+* Mon Oct 31 2010 David Timms <iinet.net.au@dtimms> - 1.3.12-0.8.beta
+- fix hang when play at speed with ratio less than 0.09 is used (#637347)
+
* Sat Aug 7 2010 David Timms <iinet.net.au@dtimms> - 1.3.12-0.7.beta
- patch to suit APIChange introduced in ffmpeg-0.6. Resolves rfbz #1356.
fixes ffmpeg import/export.
Index: sources
===================================================================
RCS file: /cvs/free/rpms/audacity-freeworld/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources 27 Jun 2010 14:41:58 -0000 1.7
+++ sources 26 Apr 2011 13:20:06 -0000 1.8
@@ -1 +1 @@
-76996fec67181ca82ba191e012518b57 audacity-minsrc-1.3.12-beta.tar.bz2
+57be7fadb8c8dd17b8462c7ac1561d03 audacity-minsrc-1.3.13-beta.tar.bz2
--- audacity-1.3.10-desktop.patch DELETED ---
--- audacity-1.3.12-ffmpeg-0.6-apichange-av_match_ext.patch DELETED ---
--- audacity.desktop DELETED ---
13 years
rpms/dvbcut/F-14 dvbcut-svn176-desktop-additions.patch, NONE, 1.1 dvbcut-svn176-fix-help-install-path.patch, NONE, 1.1 dvbcut-svn176-fix-make-install.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 dvbcut.spec, 1.12, 1.13 sources, 1.5, 1.6 dvbcut-svn170-fix-help-install-path.patch, 1.1, NONE dvbcut-svn170-fix-make-install.patch, 1.1, NONE dvbcut.desktop, 1.3, NONE
by David Timms
Author: dtimms
Update of /cvs/free/rpms/dvbcut/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26967
Modified Files:
.cvsignore dvbcut.spec sources
Added Files:
dvbcut-svn176-desktop-additions.patch
dvbcut-svn176-fix-help-install-path.patch
dvbcut-svn176-fix-make-install.patch
Removed Files:
dvbcut-svn170-fix-help-install-path.patch
dvbcut-svn170-fix-make-install.patch dvbcut.desktop
Log Message:
update to 0.6.1 release post svn176
includes upstream enhancement to work with certain transport streams
delete upstreamed patches
update makefile patches
delete desktop file, patch included desktop file instead.
dvbcut-svn176-desktop-additions.patch:
dvbcut.desktop.in | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
--- NEW FILE dvbcut-svn176-desktop-additions.patch ---
--- dvbcut.desktop.in.orig 2011-04-25 11:27:29.000000000 +1000
+++ dvbcut.desktop.in 2011-04-26 11:37:42.022156749 +1000
@@ -2,13 +2,14 @@
Type=Application
Version=1.0
Name=DVBcut
-GenericName=DVB Cutting Program
+GenericName=DVB Cutting Program for MPEG Transport Stream files
NoDisplay=false
-Comment=Cut DVB streams
+Comment=Trim and cut video MPEG2 transport streams into multiple export formats
Icon=@prefix(a)/share/dvbcut/icons/dvbcut.svg
TryExec=@prefix@/bin/dvbcut
Exec=@prefix@/bin/dvbcut %F
Terminal=false
-MimeType=application/x-dvbcut;
-Categories=AudioVideo;AudioVideoEditing;Qt;
+MimeType=application/x-dvbcut;video/mpeg;
+Categories=AudioVideo;Player;AudioVideoEditing;Qt;
StartupWMClass=Dvbcut
+#nautilus /usr/share/applications, and refresh F5 to see changes to this file.
dvbcut-svn176-fix-help-install-path.patch:
Makefile.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE dvbcut-svn176-fix-help-install-path.patch ---
--- src/Makefile.in.orig 2011-04-25 11:27:24.000000000 +1000
+++ src/Makefile.in 2011-04-26 10:35:06.439380620 +1000
@@ -29,7 +29,7 @@
datarootdir = @datarootdir@
mandir = @mandir@
man1dir = $(mandir)/man1
-helpdir = $(prefix)/share/help
+helpdir = $(datadir)/dvbcut
installdirs = $(DESTDIR)$(bindir) $(DESTDIR)$(helpdir)
dvbcut-svn176-fix-make-install.patch:
makefile.in | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
--- NEW FILE dvbcut-svn176-fix-make-install.patch ---
--- makefile.in.orig 2011-04-25 11:27:29.000000000 +1000
+++ makefile.in 2011-04-26 09:56:06.506983163 +1000
@@ -30,9 +30,9 @@
pkgdatadir = $(datarootdir)/dvbcut
installdirs = $(DESTDIR)$(man1dir) \
- $(DESTDIR)$(pkgdatadir)/icons \
- $(DESTDIR)/usr/share/applications \
- $(DESTDIR)/usr/share/mime/packages
+ $(DESTDIR)$(datadir)/icons/hicolor/scalable/apps \
+ $(DESTDIR)$(datadir)/applications \
+ $(DESTDIR)$(datadir)/mime/packages
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
@@ -47,10 +47,9 @@
dep-local:
install-local: $(installdirs) dvbcut.1 dvbcut.desktop dvbcut.xml
$(INSTALL_DATA) dvbcut.1 $(DESTDIR)$(man1dir)/dvbcut.1
- $(INSTALL_DATA) dvbcut.desktop $(DESTDIR)/usr/share/applications
- $(INSTALL_DATA) dvbcut.svg $(DESTDIR)$(pkgdatadir)/icons
- $(INSTALL_DATA) dvbcut.xml $(DESTDIR)/usr/share/mime/packages
- -update-mime-database $(DESTDIR)/usr/share/mime
+ $(INSTALL_DATA) dvbcut.desktop $(DESTDIR)$(datadir)/applications
+ $(INSTALL_DATA) dvbcut.svg $(DESTDIR)$(datadir)/icons/hicolor/scalable/apps
+ $(INSTALL_DATA) dvbcut.xml $(DESTDIR)$(datadir)/mime/packages
$(installdirs):
$(SHELL) $(top_srcdir)/mkinstalldirs $@
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/dvbcut/F-14/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 17 Mar 2011 13:10:50 -0000 1.5
+++ .cvsignore 26 Apr 2011 03:32:35 -0000 1.6
@@ -1 +1 @@
-dvbcut-svn170.tar.bz2
+dvbcut-svn176.tar.bz2
Index: dvbcut.spec
===================================================================
RCS file: /cvs/free/rpms/dvbcut/F-14/dvbcut.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- dvbcut.spec 17 Mar 2011 13:10:50 -0000 1.12
+++ dvbcut.spec 26 Apr 2011 03:32:35 -0000 1.13
@@ -1,4 +1,4 @@
-%define svnrev 170
+%define svnrev 176
%if 0%{?fedora} > 6
%define qt3 qt3
%else
@@ -6,25 +6,28 @@
%endif
Name: dvbcut
-Version: 0.6.0
-Release: 12.svn%{svnrev}%{?dist}
+Version: 0.6.1
+Release: 1.svn%{svnrev}%{?dist}
Summary: Clip and convert DVB transport streams to MPEG2 program streams
Group: Applications/Multimedia
License: GPLv2+ and LGPLv2
URL: http://dvbcut.sourceforge.net/
# fixes were committed to svn since release, so using svn checkout for latest fixes:
+# original upstream archive location:
#Source0: http://downloads.sourceforge.net/dvbcut/dvbcut_%{version}.tar.bz2
+# current upstream release location:
+#Source0: http://www.mr511.de/dvbcut/dvbcut-0.6.1.tar.gz
# use sh dvbcut-snapshot.sh to create the archive
Source0: %{name}-svn%{svnrev}.tar.bz2
# This desktop file was created by hand.
-Source4: %{name}.desktop
Source5: %{name}-snapshot.sh
Source6: %{name}-servicemenu.desktop
# helpfile is placed in /usr/share/help. Look for it under /usr/share/dvbcut instead
Patch0: %{name}-fix-help-path.patch
-Patch1: %{name}-svn170-fix-make-install.patch
-Patch2: %{name}-svn170-fix-help-install-path.patch
+Patch1: %{name}-svn176-fix-make-install.patch
+Patch2: %{name}-svn176-fix-help-install-path.patch
+Patch3: %{name}-svn176-desktop-additions.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: autoconf
@@ -51,10 +54,14 @@
%prep
+# for release archive
+#%#setup -q
+# for svn tag
%setup -q -n %{name}-svn%{svnrev}
%patch0 -b .fix-help-path
%patch1 -b .fix-make-install
%patch2 -b .fix-help-install
+%patch3 -b .desktop-improvements
# Fix QTDIR libs in configure
sed -i 's,$QTDIR/$mr_libdirname,$QTDIR/lib,' configure.in
@@ -83,7 +90,7 @@
mkdir -p %{buildroot}%{_datadir}/applications
desktop-file-install --vendor="" \
- --dir %{buildroot}%{_datadir}/applications %{SOURCE4}
+ --dir %{buildroot}%{_datadir}/applications dvbcut.desktop
#in future: %{_kde4_servicesdir}, but for now
mkdir -p %{buildroot}%{_kde4_datadir}/kde4/services/
@@ -126,6 +133,17 @@
%changelog
+* Mon Apr 25 2011 David Timms <iinet.net.au at dtimms> - 0.6.1-1.svn176
+- update to 0.6.1 release post svn176
+- includes upstream enhancement to work with certain transport streams
+- delete upstreamed patches
+- update makefile patches
+- delete desktop file, patch included desktop file instead.
+
+* Fri Apr 22 2011 David Timms <iinet.net.au at dtimms> - 0.6.0-13.svn170
+- add patch to fix code to allow build with gcc-4.6
+- add export dialog close button to suit gnome 3
+
* Thu Mar 17 2011 David Timms <iinet.net.au at dtimms> - 0.6.0-12.svn170
- fix Makefile.in to place files into standard locations
- fix src/Makefile to place online help in standard location
Index: sources
===================================================================
RCS file: /cvs/free/rpms/dvbcut/F-14/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 17 Mar 2011 13:10:50 -0000 1.5
+++ sources 26 Apr 2011 03:32:35 -0000 1.6
@@ -1 +1 @@
-321b6be72ea7186a383274a2eae2eddb dvbcut-svn170.tar.bz2
+daf673f53f4c3893bd78338a9372cbc4 dvbcut-svn176.tar.bz2
--- dvbcut-svn170-fix-help-install-path.patch DELETED ---
--- dvbcut-svn170-fix-make-install.patch DELETED ---
--- dvbcut.desktop DELETED ---
13 years
rpms/dvbcut/devel dvbcut-svn176-desktop-additions.patch, NONE, 1.1 dvbcut-svn176-fix-help-install-path.patch, NONE, 1.1 dvbcut-svn176-fix-make-install.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 dvbcut.spec, 1.11, 1.12 sources, 1.4, 1.5 dvbcut.desktop, 1.3, NONE dvbcut.logo.16x16.png, 1.1, NONE dvbcut.logo.24x24.png, 1.1, NONE dvbcut.logo.48x48.png, 1.1, NONE
by David Timms
Author: dtimms
Update of /cvs/free/rpms/dvbcut/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv20718
Modified Files:
.cvsignore dvbcut.spec sources
Added Files:
dvbcut-svn176-desktop-additions.patch
dvbcut-svn176-fix-help-install-path.patch
dvbcut-svn176-fix-make-install.patch
Removed Files:
dvbcut.desktop dvbcut.logo.16x16.png dvbcut.logo.24x24.png
dvbcut.logo.48x48.png
Log Message:
update to 0.6.1 release post svn176
includes upstream enhancement to work with certain transport streams
delete upstreamed patches
update makefile patches
delete desktop file, patch included desktop file instead.
dvbcut-svn176-desktop-additions.patch:
dvbcut.desktop.in | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
--- NEW FILE dvbcut-svn176-desktop-additions.patch ---
--- dvbcut.desktop.in.orig 2011-04-25 11:27:29.000000000 +1000
+++ dvbcut.desktop.in 2011-04-26 11:37:42.022156749 +1000
@@ -2,13 +2,14 @@
Type=Application
Version=1.0
Name=DVBcut
-GenericName=DVB Cutting Program
+GenericName=DVB Cutting Program for MPEG Transport Stream files
NoDisplay=false
-Comment=Cut DVB streams
+Comment=Trim and cut video MPEG2 transport streams into multiple export formats
Icon=@prefix(a)/share/dvbcut/icons/dvbcut.svg
TryExec=@prefix@/bin/dvbcut
Exec=@prefix@/bin/dvbcut %F
Terminal=false
-MimeType=application/x-dvbcut;
-Categories=AudioVideo;AudioVideoEditing;Qt;
+MimeType=application/x-dvbcut;video/mpeg;
+Categories=AudioVideo;Player;AudioVideoEditing;Qt;
StartupWMClass=Dvbcut
+#nautilus /usr/share/applications, and refresh F5 to see changes to this file.
dvbcut-svn176-fix-help-install-path.patch:
Makefile.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE dvbcut-svn176-fix-help-install-path.patch ---
--- src/Makefile.in.orig 2011-04-25 11:27:24.000000000 +1000
+++ src/Makefile.in 2011-04-26 10:35:06.439380620 +1000
@@ -29,7 +29,7 @@
datarootdir = @datarootdir@
mandir = @mandir@
man1dir = $(mandir)/man1
-helpdir = $(prefix)/share/help
+helpdir = $(datadir)/dvbcut
installdirs = $(DESTDIR)$(bindir) $(DESTDIR)$(helpdir)
dvbcut-svn176-fix-make-install.patch:
makefile.in | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
--- NEW FILE dvbcut-svn176-fix-make-install.patch ---
--- makefile.in.orig 2011-04-25 11:27:29.000000000 +1000
+++ makefile.in 2011-04-26 09:56:06.506983163 +1000
@@ -30,9 +30,9 @@
pkgdatadir = $(datarootdir)/dvbcut
installdirs = $(DESTDIR)$(man1dir) \
- $(DESTDIR)$(pkgdatadir)/icons \
- $(DESTDIR)/usr/share/applications \
- $(DESTDIR)/usr/share/mime/packages
+ $(DESTDIR)$(datadir)/icons/hicolor/scalable/apps \
+ $(DESTDIR)$(datadir)/applications \
+ $(DESTDIR)$(datadir)/mime/packages
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
@@ -47,10 +47,9 @@
dep-local:
install-local: $(installdirs) dvbcut.1 dvbcut.desktop dvbcut.xml
$(INSTALL_DATA) dvbcut.1 $(DESTDIR)$(man1dir)/dvbcut.1
- $(INSTALL_DATA) dvbcut.desktop $(DESTDIR)/usr/share/applications
- $(INSTALL_DATA) dvbcut.svg $(DESTDIR)$(pkgdatadir)/icons
- $(INSTALL_DATA) dvbcut.xml $(DESTDIR)/usr/share/mime/packages
- -update-mime-database $(DESTDIR)/usr/share/mime
+ $(INSTALL_DATA) dvbcut.desktop $(DESTDIR)$(datadir)/applications
+ $(INSTALL_DATA) dvbcut.svg $(DESTDIR)$(datadir)/icons/hicolor/scalable/apps
+ $(INSTALL_DATA) dvbcut.xml $(DESTDIR)$(datadir)/mime/packages
$(installdirs):
$(SHELL) $(top_srcdir)/mkinstalldirs $@
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/dvbcut/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 26 Oct 2009 12:32:29 -0000 1.4
+++ .cvsignore 26 Apr 2011 02:07:33 -0000 1.5
@@ -1 +1 @@
-dvbcut-svn166.tar.bz2
+dvbcut-svn176.tar.bz2
Index: dvbcut.spec
===================================================================
RCS file: /cvs/free/rpms/dvbcut/devel/dvbcut.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- dvbcut.spec 26 Oct 2009 12:36:03 -0000 1.11
+++ dvbcut.spec 26 Apr 2011 02:07:33 -0000 1.12
@@ -1,4 +1,4 @@
-%define svnrev 166
+%define svnrev 176
%if 0%{?fedora} > 6
%define qt3 qt3
%else
@@ -6,28 +6,28 @@
%endif
Name: dvbcut
-Version: 0.6.0
-Release: 10.svn%{svnrev}%{?dist}
+Version: 0.6.1
+Release: 1.svn%{svnrev}%{?dist}
Summary: Clip and convert DVB transport streams to MPEG2 program streams
Group: Applications/Multimedia
License: GPLv2+ and LGPLv2
URL: http://dvbcut.sourceforge.net/
# fixes were committed to svn since release, so using svn checkout for latest fixes:
+# original upstream archive location:
#Source0: http://downloads.sourceforge.net/dvbcut/dvbcut_%{version}.tar.bz2
+# current upstream release location:
+#Source0: http://www.mr511.de/dvbcut/dvbcut-0.6.1.tar.gz
# use sh dvbcut-snapshot.sh to create the archive
Source0: %{name}-svn%{svnrev}.tar.bz2
-# Since no icons have been developed by the project, created icons using the
-# weblogo on the home page. Scaled and text pixel edited using gimp.
-Source1: %{name}.logo.16x16.png
-Source2: %{name}.logo.24x24.png
-Source3: %{name}.logo.48x48.png
# This desktop file was created by hand.
-Source4: %{name}.desktop
Source5: %{name}-snapshot.sh
Source6: %{name}-servicemenu.desktop
-# helpfile is placed in /usr/share/help. Look for it under /usr/share/dvbcut
+# helpfile is placed in /usr/share/help. Look for it under /usr/share/dvbcut instead
Patch0: %{name}-fix-help-path.patch
+Patch1: %{name}-svn176-fix-make-install.patch
+Patch2: %{name}-svn176-fix-help-install-path.patch
+Patch3: %{name}-svn176-desktop-additions.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: autoconf
@@ -54,14 +54,18 @@
%prep
+# for release archive
+#%#setup -q
+# for svn tag
%setup -q -n %{name}-svn%{svnrev}
%patch0 -b .fix-help-path
-
+%patch1 -b .fix-make-install
+%patch2 -b .fix-help-install
+%patch3 -b .desktop-improvements
# Fix QTDIR libs in configure
sed -i 's,$QTDIR/$mr_libdirname,$QTDIR/lib,' configure.in
-
# Avoid stripping binaries
sed -i 's,$(STRIP) $(topdir)/bin/dvbcut$(EXEEXT),,' src/Makefile.in
@@ -75,31 +79,18 @@
autoconf
%configure --with-ffmpeg=%{_prefix} \
--with-ffmpeg-include=%{_includedir}/ffmpeg/
+ helpdir=%{_datadir}/%{name}
+
# It does not compile with smp_mflags
make
%install
-rm -rf %{buildroot}
-make install \
- bindir=%{buildroot}%{_bindir} \
- helpdir=%{buildroot}%{_datadir}/%{name} \
- mandir=%{buildroot}%{_mandir}
-
-# manual install of icons
-for iconsize in 16x16 24x24 48x48; do
- mkdir -p %{buildroot}%{_datadir}/icons/hicolor/$iconsize/apps/
-done
-install -p -m 644 %{SOURCE1} \
- %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
-install -p -m 644 %{SOURCE2} \
- %{buildroot}%{_datadir}/icons/hicolor/24x24/apps/%{name}.png
-install -p -m 644 %{SOURCE3} \
- %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
+make DESTDIR=%{buildroot} install
mkdir -p %{buildroot}%{_datadir}/applications
desktop-file-install --vendor="" \
- --dir %{buildroot}%{_datadir}/applications %{SOURCE4}
+ --dir %{buildroot}%{_datadir}/applications dvbcut.desktop
#in future: %{_kde4_servicesdir}, but for now
mkdir -p %{buildroot}%{_kde4_datadir}/kde4/services/
@@ -135,13 +126,35 @@
%{_bindir}/%{name}
%{_mandir}/man1/%{name}.1.gz
%{_datadir}/applications/*.desktop
-%{_datadir}/icons/hicolor/*/apps/%{name}.png
+%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
%{_datadir}/%{name}/dvbcut_*.html
%{_kde4_datadir}/kde4/services/*.desktop
+%{_datadir}/mime/packages/dvbcut.xml
%changelog
-* Mon Oct 26 2009 David Timms <iinet.net.au at dtimms> - 0.6.0-10.svn166
+* Mon Apr 25 2011 David Timms <iinet.net.au at dtimms> - 0.6.1-1.svn176
+- update to 0.6.1 release post svn176
+- includes upstream enhancement to work with certain transport streams
+- delete upstreamed patches
+- update makefile patches
+- delete desktop file, patch included desktop file instead.
+
+* Fri Apr 22 2011 David Timms <iinet.net.au at dtimms> - 0.6.0-13.svn170
+- add patch to fix code to allow build with gcc-4.6
+- add export dialog close button to suit gnome 3
+
+* Thu Mar 17 2011 David Timms <iinet.net.au at dtimms> - 0.6.0-12.svn170
+- fix Makefile.in to place files into standard locations
+- fix src/Makefile to place online help in standard location
+- del old icons
+- package new icon and mime info files
+- adjust configure/make/install to suit fixed Makefile.in
+
+* Fri Feb 11 2011 David Timms <iinet.net.au at dtimms> - 0.6.0-11.svn170
+- update to svn170 to pull in gcc-4.5 patches
+
+* Mon Oct 26 2009 David Timms <iinet.net.au at dtimms> - 0.6.0-10.svn166
- update to svn166
- drop upstreamed gcc44 patch
- add mpg mimetype to gnome desktop to provide mpeg open with in nautilus
Index: sources
===================================================================
RCS file: /cvs/free/rpms/dvbcut/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 26 Oct 2009 12:32:29 -0000 1.4
+++ sources 26 Apr 2011 02:07:33 -0000 1.5
@@ -1 +1 @@
-9f7f4aaf61cf236422c07aa8d8617126 dvbcut-svn166.tar.bz2
+daf673f53f4c3893bd78338a9372cbc4 dvbcut-svn176.tar.bz2
--- dvbcut.desktop DELETED ---
13 years
rpms/gecko-mediaplayer/F-14 gecko-mediaplayer.spec,1.24,1.25
by Julian Sikorski
Author: belegdol
Update of /cvs/free/rpms/gecko-mediaplayer/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv11153/F-14
Modified Files:
gecko-mediaplayer.spec
Log Message:
Dropped the libxul2 patch properly
Index: gecko-mediaplayer.spec
===================================================================
RCS file: /cvs/free/rpms/gecko-mediaplayer/F-14/gecko-mediaplayer.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- gecko-mediaplayer.spec 25 Apr 2011 21:14:06 -0000 1.24
+++ gecko-mediaplayer.spec 25 Apr 2011 21:16:33 -0000 1.25
@@ -7,7 +7,6 @@
License: GPLv2+
URL: http://kdekorte.googlepages.com/gecko-mediaplayer
Source0: http://gecko-mediaplayer.googlecode.com/files/%{name}-%{version}.tar.gz
-Patch0: gecko-mediaplayer-1.0.0-libxul2.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: dbus-glib-devel
13 years
