rpms/dvdrip/F-10 dvdrip-0.98.8-default_config.patch, NONE, 1.1 dvdrip-0.98.9-fix_locale.patch, NONE, 1.1 dvdrip-0.98.9-fping_path.patch, NONE, 1.1 dvdrip-0.98.9-rm-GUI_Pipe.patch, NONE, 1.1 dvdrip-0.98.9-test_Locale.patch, NONE, 1.1 dvdrip.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[NicolasChauvet]

Author: kwizart

Update of /cvs/free/rpms/dvdrip/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv32127/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	dvdrip-0.98.8-default_config.patch 
	dvdrip-0.98.9-fix_locale.patch dvdrip-0.98.9-fping_path.patch 
	dvdrip-0.98.9-rm-GUI_Pipe.patch 
	dvdrip-0.98.9-test_Locale.patch dvdrip.spec 
Log Message:
Initial import for F-10


dvdrip-0.98.8-default_config.patch:

--- NEW FILE dvdrip-0.98.8-default_config.patch ---
diff -up dvdrip-0.98.8/lib/Video/DVDRip/Config.pm.defaultconfig dvdrip-0.98.8/lib/Video/DVDRip/Config.pm
--- dvdrip-0.98.8/lib/Video/DVDRip/Config.pm.defaultconfig	2008-05-08 15:07:30.000000000 +0200
+++ dvdrip-0.98.8/lib/Video/DVDRip/Config.pm	2008-05-08 15:09:57.000000000 +0200
@@ -252,7 +252,7 @@ my %CONFIG_PARAMETER = (
     ogg_file_ext => {
         label => __ "OGG file extension",
         type  => 'string',
-        value => 'ogm',
+        value => 'ogg',
         presets => [ 'ogg', 'ogm', ],
     },
     cluster_master_local => {


dvdrip-0.98.9-fix_locale.patch:

--- NEW FILE dvdrip-0.98.9-fix_locale.patch ---
diff -up dvdrip-0.98.9/l10n/Makefile.fix_locale dvdrip-0.98.9/l10n/Makefile
--- dvdrip-0.98.9/l10n/Makefile.fix_locale	2008-12-09 18:44:23.000000000 +0100
+++ dvdrip-0.98.9/l10n/Makefile	2008-12-09 18:45:17.000000000 +0100
@@ -64,6 +64,8 @@ install: $(MO_FILES)
 		cp -f $$cat $$dest && chmod 644 $$dest || exit 1; \
 	done
 	touch .mo.installed
+
+gensplash:
 	cd ..; \
 	tools/gensplash
 
diff -up dvdrip-0.98.9/l10n/POTFILES.in.fix_locale dvdrip-0.98.9/l10n/POTFILES.in
--- dvdrip-0.98.9/l10n/POTFILES.in.fix_locale	2006-07-02 22:27:04.000000000 +0200
+++ dvdrip-0.98.9/l10n/POTFILES.in	2008-12-09 18:41:53.000000000 +0100
@@ -67,14 +67,3 @@
 ../lib/Video/DVDRip/Term/Progress.pm
 ../lib/Video/DVDRip/Content.pm
 ../lib/Video/DVDRip.pm
-/home/joern/projects/Event-ExecFlow/bin/execflow
-/home/joern/projects/Event-ExecFlow/lib/Event/ExecFlow/Callbacks.pm
-/home/joern/projects/Event-ExecFlow/lib/Event/ExecFlow/Frontend.pm
-/home/joern/projects/Event-ExecFlow/lib/Event/ExecFlow/Frontend/Term.pm
-/home/joern/projects/Event-ExecFlow/lib/Event/ExecFlow/Job/Code.pm
-/home/joern/projects/Event-ExecFlow/lib/Event/ExecFlow/Job/Command.pm
-/home/joern/projects/Event-ExecFlow/lib/Event/ExecFlow/Job/Group.pm
-/home/joern/projects/Event-ExecFlow/lib/Event/ExecFlow/Job.pm
-/home/joern/projects/Event-ExecFlow/lib/Event/ExecFlow.pm
-/home/joern/projects/Event-ExecFlow/lib/Event/ExecFlow/Scheduler.pm
-/home/joern/projects/Event-ExecFlow/lib/Event/ExecFlow/Scheduler/SimpleMax.pm
diff -up dvdrip-0.98.9/tools/gensplash.fix_locale dvdrip-0.98.9/tools/gensplash
--- dvdrip-0.98.9/tools/gensplash.fix_locale	2006-09-09 13:07:31.000000000 +0200
+++ dvdrip-0.98.9/tools/gensplash	2008-12-09 18:41:53.000000000 +0100
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
 
 use strict;
 use lib "lib";

dvdrip-0.98.9-fping_path.patch:

--- NEW FILE dvdrip-0.98.9-fping_path.patch ---
diff -up dvdrip-0.98.9/lib/Video/DVDRip/Depend.pm.path dvdrip-0.98.9/lib/Video/DVDRip/Depend.pm
--- dvdrip-0.98.9/lib/Video/DVDRip/Depend.pm.path	2008-11-29 11:13:13.000000000 +0100
+++ dvdrip-0.98.9/lib/Video/DVDRip/Depend.pm	2008-11-29 11:14:06.000000000 +0100
@@ -261,10 +261,10 @@ my %TOOLS = (
     },
     fping => {
         order       => ++$ORDER,
-        command     => "fping",
+        command     => "/usr/sbin/fping",
         comment     => __ "Only for cluster mode master",
         optional    => 1,
-        version_cmd => "fping -v",
+        version_cmd => "/usr/sbin/fping -v",
         get_version => sub {
             my ($cmd) = @_;
             qx[$cmd 2>&1] =~ /Version\s+(\d+\.\d+(\.\d+)?)/i;

dvdrip-0.98.9-rm-GUI_Pipe.patch:

--- NEW FILE dvdrip-0.98.9-rm-GUI_Pipe.patch ---
diff -up dvdrip-0.98.9/lib/Video/DVDRip/Term/Main.pm~ dvdrip-0.98.9/lib/Video/DVDRip/Term/Main.pm
--- dvdrip-0.98.9/lib/Video/DVDRip/Term/Main.pm~	2006-08-16 21:34:38.000000000 +0200
+++ dvdrip-0.98.9/lib/Video/DVDRip/Term/Main.pm	2008-12-16 02:16:15.000000000 +0100
@@ -20,7 +20,6 @@ use strict;
 use Video::DVDRip::Project;
 use Video::DVDRip::Logger;
 use Video::DVDRip::Term::Progress;
-use Video::DVDRip::GUI::Pipe;
 use Video::DVDRip::Term::ExitTask;
 
 sub filename            { shift->{filename}                         }

dvdrip-0.98.9-test_Locale.patch:

--- NEW FILE dvdrip-0.98.9-test_Locale.patch ---
diff -up dvdrip-0.98.9/lib/Video/DVDRip/Config.pm~ dvdrip-0.98.9/lib/Video/DVDRip/Config.pm
--- dvdrip-0.98.9/lib/Video/DVDRip/Config.pm~	2008-12-10 12:07:47.000000000 +0100
+++ dvdrip-0.98.9/lib/Video/DVDRip/Config.pm	2008-12-10 12:08:23.000000000 +0100
@@ -10,6 +10,7 @@
 
 package Video::DVDRip::Config;
 use Locale::TextDomain qw (video.dvdrip);
+use POSIX qw(locale_h);
 
 use base Video::DVDRip::Base;
 


--- NEW FILE dvdrip.spec ---
Name:           dvdrip
Version:        0.98.9
Release:        6%{?dist}
Summary:        Graphical DVD ripping and encoding tool

Group:          Applications/Multimedia
License:        (GPL+ or Artistic) and CC-BY-SA
URL:            http://www.exit1.org/dvdrip/
Source0:        http://www.exit1.org/dvdrip/dist/dvdrip-%{version}.tar.gz
Patch1:         dvdrip-0.98.8-default_config.patch
Patch2:         dvdrip-0.98.9-fping_path.patch
Patch3:         dvdrip-0.98.9-fix_locale.patch
Patch4:         dvdrip-0.98.9-test_Locale.patch
Patch5:         dvdrip-0.98.9-rm-GUI_Pipe.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: perl(Gtk2) >= 1.121
BuildRequires: perl(Gtk2::Ex::FormFactory) >= 0.65
BuildRequires: perl(Locale::TextDomain) >= 1.16
BuildRequires: perl(Event::ExecFlow) >= 0.62
BuildRequires: perl(Event::RPC) >= 0.89
BuildRequires: perl(AnyEvent) >= 1.02
BuildRequires: desktop-file-utils
BuildRequires: gettext
Requires: ImageMagick
#Needed for transcoding
Requires: transcode >= 0.6.13
Requires: %{name}-master = %{version}-%{release}
#Optionals
# subtitleripper, vcdimager, lsdvd, xvid4conf
# ogmtools is deprecated since ogm/ogg container (for video) is broken
# according to ffmpeg/MPlayer developers
# -master Requires: fping

%description
dvd::rip is a full featured DVD copy program. It provides an easy to use but
feature-rich Gtk+ GUI to control almost all aspects of the ripping and
transcoding process. It uses the widely known video processing swissknife
transcode and many other Open Source tools.

%package        master
Summary:        Master node controler for %{name}
Group:          Applications/Multimedia
Requires:       fping

%description    master
The %{name}-master package contains the master node controler for %{name}.


%prep
%setup -q
#%%patch0 -p1 -b .nontplworkaround
# OGM container is deprecated and shound't be used anymore
%patch1 -p1 -b .defaultconfig
%patch2 -p1 -b .path
%patch3 -p1 -b .fix_locale
%patch4 -p1 -b .test_locale
%patch5 -p1 -b .rm-GUI_Pipe

#Remove pre-built mo
find lib/LocaleData -name "*.mo" -exec rm -f {} ';'

#Fix the part that need an X screen at l10n regeneration.

# Fix encoding issues:
%define docfiles Changes Changes.0.46 COPYRIGHT Credits README TODO lib/Video/DVDRip/translators.txt
for txtfile in %docfiles ; do
    iconv -f iso-8859-1 -t UTF8 $txtfile -o $txtfile.utf8
    touch -r $txtfile $txtfile.utf8
    mv -f $txtfile.utf8 $txtfile
done

# Fix permission:
chmod -x lib/Video/DVDRip/Cluster/Webserver.pm

# Remove the included perl modules. The ones 
# installed in the system will be used instead:
rm -fr perl-modules

%build
#We make the LocaleData
pushd l10n
  make all
popd
#Compilation sometime fails with parallele make

# We first build dvdrip-progress.c dvdrip-splitpipe.c with our flags
# The compilation won't be done twince as the binaries are already here.
# Note that only theses two make the package arch dependant (not the perl side).
pushd src
make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
popd

%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec rm -f {} ';'
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*

desktop-file-install --vendor "" \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  --mode 644 \
  %{name}.desktop

#Install icon
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps
install -pm 0644 dvdrip-icon-hq.svg $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg

#Fix for locale
mkdir -p $RPM_BUILD_ROOT%{_datadir}/locale
mv $RPM_BUILD_ROOT%{perl_vendorlib}/LocaleData/* $RPM_BUILD_ROOT%{_datadir}/locale
rmdir $RPM_BUILD_ROOT%{perl_vendorlib}/LocaleData
%find_lang video.dvdrip

%clean
rm -rf $RPM_BUILD_ROOT

%check
%{?_with_test:make test}


%post
# update icon themes
touch --no-create %{_datadir}/icons/hicolor
if [ -x /usr/bin/gtk-update-icon-cache ]; then
  /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi 

%postun
# update icon themes
touch --no-create %{_datadir}/icons/hicolor
if [ -x /usr/bin/gtk-update-icon-cache ]; then
  /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi

%files
%defattr(-,root,root,-)
%doc %docfiles lib/Video/DVDRip/license.txt
%exclude %{_bindir}/%{name}-master
%{_bindir}/%{name}*
%{perl_vendorlib}/Video/DVDRip/GUI
%{_datadir}/applications/*%{name}.desktop
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
%{_mandir}/man1/*.1*
%{_mandir}/man3/*.3*

%files master -f video.dvdrip.lang
%defattr(-,root,root,-)
%{_bindir}/%{name}-master
%exclude %{perl_vendorlib}/Video/DVDRip/GUI
%{perl_vendorlib}/Video/DVDRip/
%{perl_vendorlib}/Video/DVDRip.pm


%changelog
* Fri Dec 12 2008 kwizart < kwizart at gmail.com > - 0.98.9-6
- Split dvdrip-master
* Wed Dec 10 2008 kwizart < kwizart at gmail.com > - 0.98.9-5
- Update BuildRequirement as described in Makefile.PL
- Fix Make test
* Tue Dec  9 2008 Orcan Ogetbil < orcanbahri [AT] yahoo [DOT] com > - 0.98.9-4
- Fix encoding and permission issues
- Remove the packaged perl modules during %%prep.
- Minor SPEC file cleanup.
- Comment out unnecessary BR's.
- Comment out the nontplworkaround patch.
* Tue Dec  9 2008 kwizart < kwizart at gmail.com > - 0.98.9-3
- Fix DataLocale regenerated
- Fix the License
* Sat Nov 29 2008 kwizart < kwizart at gmail.com > - 0.98.9-2
- Fix fping path
* Thu Oct  9 2008 kwizart < kwizart at gmail.com > - 0.98.9-1
- Update to 0.98.9
* Mon Sep 29 2008 kwizart < kwizart at gmail.com > - 0.98.8-3
- Remove non-mandatory requirement.
* Thu Sep 11 2008 kwizart < kwizart at gmail.com > - 0.98.8-2
- Remove optionals tools
* Wed Apr 30 2008 kwizart < kwizart at gmail.com > - 0.98.8-1
- Initial package for RPM Fusion


Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/dvdrip/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Dec 2008 09:17:15 -0000	1.1
+++ .cvsignore	19 Dec 2008 17:53:33 -0000	1.2
@@ -0,0 +1 @@
+dvdrip-0.98.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/free/rpms/dvdrip/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Dec 2008 09:17:15 -0000	1.1
+++ sources	19 Dec 2008 17:53:33 -0000	1.2
@@ -0,0 +1 @@
+580b84f717f9b8ef962771474d966172  dvdrip-0.98.9.tar.gz