rpms/avidemux/devel avidemux.spec,1.53,1.54

[Richard Shaw]

Author: hobbes1069

Update of /cvs/free/rpms/avidemux/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv2811

Modified Files:
	avidemux.spec 
Log Message:
* Fri Sep 23 2011 Richard Shaw <hobbes1069 at gmail.com> - 2.5.5-5
- Remove useless devel subpackage which has multilib issues.



Index: avidemux.spec
===================================================================
RCS file: /cvs/free/rpms/avidemux/devel/avidemux.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- avidemux.spec	9 Aug 2011 18:21:43 -0000	1.53
+++ avidemux.spec	23 Sep 2011 15:54:37 -0000	1.54
@@ -2,7 +2,7 @@
 
 Name:           avidemux
 Version:        2.5.5
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Graphical video editing and transcoding tool
 
 Group:          Applications/Multimedia
@@ -149,14 +149,6 @@
 %description qt
 This package contains the Qt graphical interface for %{name}.
 
-%package devel
-Summary:        Development files for %{name}
-Group:          Development/Libraries
-Requires:       %{name}-libs = %{version}-%{release}
-
-%description devel
-This package contains files required to develop with or extend %{name}.
-
 
 %prep
 %setup -q -n %{name}_%{version}
@@ -227,16 +219,11 @@
 
 
 %install
-rm -rf %{buildroot}
-
 make -C build install DESTDIR=%{buildroot}
 make -C build_plugins install DESTDIR=%{buildroot}
 
-# Install the build configuration for devel package
-install -d -m755 %{buildroot}%{_includedir}
-install -m644 build/config/ADM_coreConfig.h %{buildroot}%{_includedir}/ADM_coreConfig.h
 install -d -m755 %{buildroot}%{_datadir}/pixmaps
-install -m644 avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/pics/avidemux_icon.png %{buildroot}%{_datadir}/pixmaps/avidemux.png
+install -pm0644 avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/pics/avidemux_icon.png %{buildroot}%{_datadir}/pixmaps/avidemux.png
 
 # Find and remove all la files
 find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
@@ -266,9 +253,6 @@
 # Gettext-style translations
 %find_lang %{name}
 
-%clean
-rm -rf %{buildroot}
-
 
 %post libs -p /sbin/ldconfig
 
@@ -291,14 +275,12 @@
 %exclude %{_libdir}/ADM_plugins/videoFilter/*gtk.so
 %exclude %{_libdir}/ADM_plugins/videoFilter/*qt4.so
 
-
 %files cli
 %{_bindir}/avidemux2_cli
 %{_libdir}/libADM_UICli.so
 %{_libdir}/libADM_render_cli.so
 %{_libdir}/ADM_plugins/videoFilter/*cli.so
 
-
 %files gtk -f %{name}.lang
 %{_bindir}/avidemux2_gtk
 %{_libdir}/libADM_UIGtk.so
@@ -318,11 +300,11 @@
 %{_datadir}/applications/*qt*.desktop
 %dir %{_datadir}/%{name}/i18n
 
-%files devel
-%{_includedir}/ADM_coreConfig.h
-
 
 %changelog
+* Fri Sep 23 2011 Richard Shaw <hobbes1069 at gmail.com> - 2.5.5-5
+- Remove useless devel subpackage which has multilib issues.
+
 * Mon Aug 07 2011 Richard Shaw <hobbes1069 at gmail.com> - 2.5.5-4
 - Moved UI specific libraries and plugins to their respective sub-package to
   prevent unneeded dependencies from being installed.