Author: rdieter Update of /cvs/free/rpms/k9copy/F-16 In directory se02.es.rpmfusion.net:/tmp/cvs-serv7962 Modified Files: .cvsignore k9copy.spec sources Added Files: k9copy-2.3.8-mimetype.patch Removed Files: k9copy-2.3.5-mimetype.patch Log Message: sync w/devel for 2.3.8 k9copy-2.3.8-mimetype.patch: k9copy.desktop | 4 ++-- k9copy_assistant.desktop | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) --- NEW FILE k9copy-2.3.8-mimetype.patch --- diff -up k9copy-2.3.8-Source/k9copy_assistant.desktop.mimetype k9copy-2.3.8-Source/k9copy_assistant.desktop --- k9copy-2.3.8-Source/k9copy_assistant.desktop.mimetype 2011-12-09 15:08:41.000000000 -0600 +++ k9copy-2.3.8-Source/k9copy_assistant.desktop 2012-02-10 09:01:12.717968602 -0600 @@ -14,9 +14,9 @@ GenericName[fr]=Backup de DVD Video GenericName[tr]=DVD Vidyo Yedekleme Aracı GenericName[ru]=Копирование с видео-DVD GenericName[uk]=Копіювання відео-DVD -MimeTypes= +MimeType= Terminal=false Icon=k9copy X-DocPath=k9copy/index.html Categories=Qt;KDE;AudioVideo;DiscBurning; -X-KDE-StartupNotify=true \ No newline at end of file +X-KDE-StartupNotify=true diff -up k9copy-2.3.8-Source/k9copy.desktop.mimetype k9copy-2.3.8-Source/k9copy.desktop --- k9copy-2.3.8-Source/k9copy.desktop.mimetype 2011-12-09 15:08:41.000000000 -0600 +++ k9copy-2.3.8-Source/k9copy.desktop 2012-02-10 09:01:02.330098511 -0600 @@ -14,9 +14,9 @@ GenericName[fr]=Backup de DVD Video GenericName[tr]=DVD Vidyo Yedekleme Aracı GenericName[ru]=Копирование с видео-DVD GenericName[uk]=Копіювання відео-DVD -MimeTypes= +MimeType= Terminal=false Icon=k9copy X-DocPath=k9copy/index.html Categories=Qt;KDE;AudioVideo;DiscBurning; -X-KDE-StartupNotify=true \ No newline at end of file +X-KDE-StartupNotify=true Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/k9copy/F-16/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 29 Sep 2010 12:18:39 -0000 1.12 +++ .cvsignore 10 Feb 2012 15:15:37 -0000 1.13 @@ -1 +1 @@ -k9copy-2.3.6-Source.tar.gz +k9copy-2.3.8-Source.tar.gz Index: k9copy.spec =================================================================== RCS file: /cvs/free/rpms/k9copy/F-16/k9copy.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- k9copy.spec 29 Sep 2010 12:18:40 -0000 1.20 +++ k9copy.spec 10 Feb 2012 15:15:37 -0000 1.21 @@ -1,6 +1,6 @@ Name: k9copy -Version: 2.3.6 +Version: 2.3.8 Release: 1%{?dist} Summary: Video DVD backup and creation program Group: Applications/Multimedia @@ -11,13 +11,15 @@ ## upstreamable patches # https://sourceforge.net/tracker/?func=detail&aid=3016058&group_id... -Patch52: k9copy-2.3.5-mimetype.patch +Patch52: k9copy-2.3.8-mimetype.patch BuildRequires: cmake BuildRequires: desktop-file-utils BuildRequires: ffmpeg-devel BuildRequires: gettext +%if 0%{?fedora} && 0%{?fedora} < 16 BuildRequires: hal-devel +%endif BuildRequires: kdelibs4-devel BuildRequires: libdvdread-devel BuildRequires: libmpeg2-devel @@ -29,8 +31,8 @@ Requires: dvdauthor # Optional, not *strictly* required: -Requires(hint): mencoder -Requires(hint): mplayer +Requires: mencoder +Requires: mplayer %description Video DVD backup and creation program, features include: @@ -62,7 +64,7 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} -%find_lang %{name} +%find_lang %{name} --with-kde %check @@ -97,11 +99,17 @@ %{_kde4_appsdir}/solid/actions/*.desktop %{_kde4_datadir}/applications/kde4/k9copy.desktop %{_kde4_datadir}/applications/kde4/k9copy_assistant.desktop -%{_kde4_docdir}/HTML/en/k9copy/ %{_kde4_iconsdir}/hicolor/*/*/* %changelog +* Fri Feb 10 2012 Rex Dieter <rdieter(a)fedoraproject.org&gt; 2.3.8-1 +- 2.3.8 +- drop use of Requires(hint) + +* Wed Feb 08 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 2.3.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Wed Sep 29 2010 Rex Dieter <rdieter(a)fedoraproject.org&gt; 2.3.6-1 - k9copy-2.3.6 Index: sources =================================================================== RCS file: /cvs/free/rpms/k9copy/F-16/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 29 Sep 2010 12:18:40 -0000 1.12 +++ sources 10 Feb 2012 15:15:37 -0000 1.13 @@ -1 +1 @@ -c062dcb141a0320afe9dae0d36f87965 k9copy-2.3.6-Source.tar.gz +584f6cc50f28befbeb0d5c1ec9476456 k9copy-2.3.8-Source.tar.gz --- k9copy-2.3.5-mimetype.patch DELETED ---