Packman Build Service PMBS

Changes of Revision 50

gmerlin.spec Changed

@@ -33,6 +33,7 @@
 # PATCH-FIX-UPSTREAM write_frame_jack.patch avvissu@yandex.ru --  Remove cruft from the audio output API
 Patch1:         gmerlin-4256-write_frame_jack.patch
 Patch2:         gmerlin-1.2.0-cdio.patch
+Patch3:         gmerlin.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  doxygen
@@ -216,25 +217,21 @@
 %lang_package
 
 %prep
-%setup -q -n %{name}
-
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
+%autosetup -p1 -n %{name}
 
+%build
 # nmjedit/Makefile.in not found
 sed -i '/apps\/nmjedit/d' configure.ac
 
 # Do not compile in DATE and TIME
 echo 'HTML_TIMESTAMP = NO' >> doc/Doxyfile.in
 
-%build
 ./autogen.sh
 %configure \
 	--with-cpuflags=none \
 	--docdir=%{_defaultdocdir}/%{name}
 
-make V=1 %{?_smp_mflags}
+%make_build
 
 %install
 %make_install
@@ -305,10 +302,8 @@
 fi
 
 %files lang -f %{name}.lang
-%defattr(0644,root,root)
 
 %files
-%defattr(0644,root,root,0755)
 %{_libdir}/gmerlin
 %exclude %{_libdir}/gmerlin/plugins/*_jack.so
 %exclude %{_libdir}/%{name}/bin/gmerlin_visualizer_slave
@@ -323,15 +318,12 @@
 %endif
 
 %files jack
-%defattr(0644,root,root,0755)
 %{_libdir}/gmerlin/plugins/*_jack.so
 
 %files -n libgmerlin%{soname}
-%defattr(0644, root ,root)
 %{_libdir}/libgmerlin.so.%{soname}*
 
 %files -n libgmerlin-devel
-%defattr(0644,root,root,0755)
 %{_docdir}/%{name}/apiref
 %{_libdir}/libgmerlin.so
 %{_includedir}/gmerlin
@@ -340,24 +332,20 @@
 %{_datadir}/gmerlin/plugin.sym
 
 %files -n libgmerlin_gtk%{soname}
-%defattr(0644, root ,root)
 %{_libdir}/libgmerlin_gtk.so.%{soname}*
 
 %files -n libgmerlin_gtk-devel
-%defattr(0644,root,root,0755)
 %dir %{_includedir}/gmerlin
 %{_libdir}/libgmerlin_gtk.so
 %{_includedir}/gmerlin/gui_gtk
 %{_libdir}/pkgconfig/gmerlin-gtk.pc
 
 %files alsamixer
-%defattr(0644,root,root)
 %attr(0755,root,root) %{_bindir}/gmerlin_alsamixer
 %{_datadir}/applications/gmerlin-alsamixer.desktop
 %{_datadir}/icons/hicolor/48x48/apps/gmerlin-alsamixer.png
 
 %files gavf-tools
-%defattr(0755,root,root,0755)
 %attr(0644,root,root) %doc README.gavftools
 %{_bindir}/gavf-decode
 %{_bindir}/gavf-demux
@@ -371,14 +359,12 @@
 %{_bindir}/gavf-tee
 
 %files kbd
-%defattr(0644,root,root)
 %attr(0755,root,root) %{_bindir}/gmerlin_kbd
 %attr(0755,root,root) %{_bindir}/gmerlin_kbd_config
 %{_datadir}/applications/gmerlin-kbd.desktop
 %{_datadir}/icons/hicolor/48x48/apps/gmerlin-kbd.png
 
 %files player
-%defattr(0644,root,root,0755)
 %attr(0755,root,root) %{_bindir}/gmerlin
 %attr(0755,root,root) %{_bindir}/gmerlin_remote
 %attr(0755,root,root) %{_bindir}/gmerlin_launcher
@@ -390,19 +376,16 @@
 %{_mandir}/man1/gmerlin_remote.1*
 
 %files plugincfg
-%defattr(0644,root,root)
 %attr(0755,root,root) %{_bindir}/gmerlin_plugincfg
 %{_datadir}/applications/gmerlin-plugincfg.desktop
 %{_datadir}/icons/hicolor/48x48/apps/gmerlin-plugincfg.png
 
 %files recorder
-%defattr(0644,root,root)
 %attr(0755,root,root) %{_bindir}/gmerlin_recorder
 %{_datadir}/applications/gmerlin-recorder.desktop
 %{_datadir}/icons/hicolor/48x48/apps/gmerlin-recorder.png
 
 %files transcoder
-%defattr(0644,root,root)
 %attr(0755,root,root) %{_bindir}/gmerlin_transcoder
 %attr(0755,root,root) %{_bindir}/gmerlin_transcoder_remote
 %{_datadir}/applications/gmerlin-transcoder.desktop
@@ -411,7 +394,6 @@
 %doc %{_mandir}/man1/gmerlin_transcoder_remote.1*
 
 %files visualizer
-%defattr(0644,root,root,0755)
 %attr(0755,root,root) %{_bindir}/gmerlin_visualize
 %attr(0755,root,root) %{_bindir}/gmerlin_visualizer
 %attr(0755,root,root) %{_libdir}/%{name}/bin/gmerlin_visualizer_slave
@@ -419,7 +401,6 @@
 %{_datadir}/icons/hicolor/48x48/apps/gmerlin-visualizer.png
 
 %files utils
-%defattr(0755,root,root)
 %{_bindir}/album2m3u
 %{_bindir}/album2pls
 %{_bindir}/gmerlin-db2nmj
@@ -441,7 +422,6 @@
 %attr(0644,root,root) %{_mandir}/man1/gmerlin-record.1*
 
 %files doc
-%defattr(0644,root,root,0755)
 %{_docdir}/%{name}
 %exclude %{_docdir}/%{name}/apiref

gmerlin.patch Added