From 8dd12dfaaef77e9b3f2e6169edc30dfd6263177e Mon Sep 17 00:00:00 2001 From: Andrey Bondrov Date: Tue, 16 Jul 2013 01:50:43 +1100 Subject: [PATCH] LOG Add patch to make more strings translatable, minor spec cleanups --- HandBrake-0.9.9-fixghb.patch | 93 ++++++++++++++++++++++++++++++++++++ handbrake.spec | 52 +++++++++----------- 2 files changed, 116 insertions(+), 29 deletions(-) create mode 100644 HandBrake-0.9.9-fixghb.patch diff --git a/HandBrake-0.9.9-fixghb.patch b/HandBrake-0.9.9-fixghb.patch new file mode 100644 index 0000000..5bd8028 --- /dev/null +++ b/HandBrake-0.9.9-fixghb.patch @@ -0,0 +1,93 @@ +diff -urN HandBrake-0.9.9/gtk/src/ghb.ui HandBrake-0.9.9-patched/gtk/src/ghb.ui +--- HandBrake-0.9.9/gtk/src/ghb.ui 2013-02-20 20:07:46.000000000 +0400 ++++ HandBrake-0.9.9-patched/gtk/src/ghb.ui 2013-07-14 10:33:37.000000000 +0400 +@@ -411,7 +411,7 @@ + + gtk-open + source_action +- _Source ++ _Source + + + +@@ -419,7 +419,7 @@ + + gtk-open + source_single_action +- Single _Title ++ Single _Title + + + +@@ -427,7 +427,7 @@ + + gtk-save-as + destination1 +- _Destination ++ _Destination + + + +@@ -456,7 +456,7 @@ + False + hb-add-queue + queue_add_menu +- _Add Queue ++ _Add Queue + + + +@@ -465,7 +465,7 @@ + False + hb-add-queue + queue_add_all_menu +- Add A_ll Queue ++ Add A_ll Queue + + + +@@ -474,7 +474,7 @@ + False + hb-start + queue_start_menu +- _Start Queue ++ _Start Queue + + + +@@ -604,7 +604,7 @@ + + + +- _Make Default ++ _Make Default + image12 + True + True +@@ -2551,7 +2551,7 @@ + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False +- Advanced ++ Advanced + + + True +@@ -3274,7 +3274,7 @@ + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Add new subtitle to the list + GTK_RELIEF_NONE +- Subtitle ++ Subtitle + subtitle_add_image + + +@@ -3290,7 +3290,7 @@ + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Add new SRT subtitle to the list + GTK_RELIEF_NONE +- Import SRT ++ Import SRT + srt_add_image + + diff --git a/handbrake.spec b/handbrake.spec index 89f4de8..3c27dae 100644 --- a/handbrake.spec +++ b/handbrake.spec @@ -1,26 +1,22 @@ %define lname HandBrake -%define major 1 -%define libname %mklibname %{name} %{major} -%define libnamedev %mklibname %{name} %{major} -d - Summary: MPEG-AVC(H.264)/MPEG-4 converter Name: handbrake Version: 0.9.9 -Release: 1 +Release: 2 License: GPLv2+ Group: Video -URL: http://handbrake.fr/ +Url: http://handbrake.fr/ Source0: %{lname}-%{version}.tar.bz2 -BuildRequires: yasm -BuildRequires: zlib1-devel -BuildRequires: bzip2-devel +Patch0: HandBrake-0.9.9-fixghb.patch BuildRequires: intltool -BuildRequires: svn BuildRequires: iso-codes -BuildRequires: valgrind BuildRequires: libtool -BuildRequires: libgstreamer0.10-plugins-base-devel +BuildRequires: svn +BuildRequires: valgrind +BuildRequires: yasm +BuildRequires: bzip2-devel +BuildRequires: pkgconfig(gstreamer-plugins-base-0.10) BuildRequires: pkgconfig(theora) BuildRequires: pkgconfig(libgtkhtml-3.14) BuildRequires: pkgconfig(libnotify) @@ -30,16 +26,18 @@ BuildRequires: pkgconfig(gudev-1.0) BuildRequires: pkgconfig(libass) BuildRequires: pkgconfig(vorbis) BuildRequires: pkgconfig(samplerate) +BuildRequires: pkgconfig(zlib) %description HandBrake is an open-source, GPL-licensed, multi-platform, -multi-threaded MPEG-AVC(x.264)/MPEG-4 converter, available for MacOS -X, Linux and Windows. It is a video encoder that takes your -movies and transfers them to a format that's useful on your -computers, media centers, and portable electronic devices. +multi-threaded MPEG-AVC(x.264)/MPEG-4 converter, available for +MacOS X, Linux and Windows. It is a video encoder that takes +your movies and transfers them to a format that's useful on +your computers, media centers, and portable electronic devices. %prep %setup -q -n %{lname}-%{version} +%patch0 -p1 #fix encoding of non-utf8 files #doesn't work, iconv detects illegal input sequence, --silent doesn't exist anymoreq #iconv -t utf-8 $RPM_BUILD_DIR/%lname-%version/CREDITS @@ -49,18 +47,16 @@ computers, media centers, and portable electronic devices. # export CFLAGS="$RPM_OPT_FLAGS" # export CXXFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{_prefix} --launch --launch-jobs=0 --enable-ff-mpeg2 - -cd build && make -cd . + +cd build && make %install -cd build -%makeinstall_std +%makeinstall_std -C build -install -m 0755 HandBrakeCLI %{buildroot}/%{_bindir}/HandBrakeCLI -cd %{buildroot}/%{_bindir} +install -m 0755 build/HandBrakeCLI %{buildroot}%{_bindir}/HandBrakeCLI +pushd %{buildroot}%{_bindir} ln -s ./HandBrakeCLI ./handbrake -cd - +popd sed -i -e "s|hb-icon|hb-icon.png|" %{buildroot}%{_datadir}/applications/ghb.desktop @@ -72,10 +68,8 @@ desktop-file-install --vendor="" \ rm -rf %{buildroot}%{_datadir}/icons/hicolor/icon-theme.cache -%clean - %files %doc AUTHORS COPYING CREDITS NEWS THANKS TRANSLATIONS -%_bindir/* -%_datadir/applications/* -%_datadir/icons/hicolor/*/apps/hb-icon.png +%{_bindir}/* +%{_datadir}/applications/* +%{_datadir}/icons/hicolor/*/apps/hb-icon.png