diff --git a/contrib/opensuse-10.spec b/contrib/opensuse-10.spec index ae9f8b7b9..baa22151c 100644 --- a/contrib/opensuse-10.spec +++ b/contrib/opensuse-10.spec @@ -13,7 +13,6 @@ Summary: tools to create, alter and inspect Matroska files License: GPL Group: Productivity/Multimedia/Other Source: %{name}-%{version}.tar.bz2 -Patch: suse-mmg-rename.diff Summary: tools to create, alter and inspect Matroska files BuildRoot: %{_tmppath}/%{name}-%{version}-build Prefix: /usr @@ -33,7 +32,6 @@ Authors: %prep rm -rf $RPM_BUILD_ROOT %setup -%patch -p1 %build export CFLAGS="$RPM_OPT_FLAGS" @@ -41,6 +39,7 @@ export CFLAGS="$RPM_OPT_FLAGS" ./drake %install +sed -i -e 's/^Exec=mmg/Exec=mkvmerge-gui/' share/desktop/mkvmergeGUI.desktop ./drake DESTDIR=$RPM_BUILD_ROOT MMG_BIN=mkvmerge-gui install %clean diff --git a/contrib/opensuse-11.4.spec b/contrib/opensuse-11.4.spec index b621d2b5b..ae4b12a96 100644 --- a/contrib/opensuse-11.4.spec +++ b/contrib/opensuse-11.4.spec @@ -4,7 +4,7 @@ # BuildRequires: expat libexpat-devel flac flac-devel gcc-c++ gtk2 gtk2-devel libogg libogg-devel libstdc++-devel libvorbis libvorbis-devel lzo lzo-devel pkgconfig boost-devel file-devel ruby libcurl-devel -BuildRequires: wxWidgets-devel patch make gettext-tools +BuildRequires: wxWidgets-devel make gettext-tools Name: mkvtoolnix URL: http://www.bunkus.org/videotools/mkvtoolnix/ @@ -14,7 +14,6 @@ Summary: tools to create, alter and inspect Matroska files License: GPL Group: Productivity/Multimedia/Other Source: %{name}-%{version}.tar.bz2 -Patch: suse-mmg-rename.diff Summary: tools to create, alter and inspect Matroska files BuildRoot: %{_tmppath}/%{name}-%{version}-build Prefix: /usr @@ -34,7 +33,6 @@ Authors: %prep rm -rf $RPM_BUILD_ROOT %setup -%patch -p1 %build export CFLAGS="$RPM_OPT_FLAGS" @@ -42,6 +40,7 @@ export CFLAGS="$RPM_OPT_FLAGS" ./drake %install +sed -i -e 's/^Exec=mmg/Exec=mkvmerge-gui/' share/desktop/mkvmergeGUI.desktop ./drake DESTDIR=$RPM_BUILD_ROOT MMG_BIN=mkvmerge-gui install %clean diff --git a/contrib/suse-mmg-rename.diff b/contrib/suse-mmg-rename.diff deleted file mode 100644 index 699218fa9..000000000 --- a/contrib/suse-mmg-rename.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- mkvtoolnix-4.4.0.orig/share/desktop/mkvmergeGUI.desktop 2010-10-31 15:42:16.000000000 +0100 -+++ mkvtoolnix-4.4.0/share/desktop/mkvmergeGUI.desktop 2010-10-31 20:04:07.076391913 +0100 -@@ -7,7 +7,7 @@ - GenericName[fr]=Créateur de fichiers MKV - GenericName[zh_TW]=MKV 檔製作軟體 - Icon=mkvmergeGUI --Exec=mmg -+Exec=mkvmerge-gui - Terminal=false - MimeType=application/x-mmg-settings;video/x-matroska;audio/x-matroska; - Categories=GNOME;AudioVideo;AudioVideoEditing;