- fix groups, pld section order

Changed files:
    mono-moonlight.spec -> 1.2

diff --git a/mono-moonlight.spec b/mono-moonlight.spec
index 333adaeb36f5bfabefd6e91d2ebbba371b50fd28..0bc2663eb997d85a932875171e74489028b825be 100644 (file)
--- a/mono-moonlight.spec
+++ b/mono-moonlight.spec
@@ -1,10 +1,9 @@
-######         Unknown group!
 Summary:       Novell Moonlight
 Name:          mono-moonlight
 Version:       @VERSION@
 Release:       0
 License:       LGPL v2.0 only ; MIT License (or similar) ; Ms-Pl
-Group:         Productivity/Multimedia/Other
+Group:         X11/Applications/Multimedia
 URL:           http://go-mono.com/moonlight/
 ExclusiveArch: %{ix86{ %{x8664}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -26,38 +25,26 @@ BuildRequires:      xulrunner-devel
 BuildRequires: zip
 # Required to build the desktop assemblies
 # Required to build the plugin
-%if %{with_ffmpeg} == yes
 BuildRequires: libffmpeg-devel
-%endif
 
 %description
 Moonlight is an open source implementation of Microsoft Silverlight
 for Unix systems.
 
 %package -n libmoon
-######         Unknown group!
 Summary:       Novell Moonlight
 License:       LGPL v2.0 only
-Group:         Productivity/Multimedia/Other
+Group:         X11/Applications/Multimedia
 Requires:      mono-core >= 2.6
 
 %description -n libmoon
 Moonlight is an open source implementation of Microsoft Silverlight
 for Unix systems.
 
-%files -n libmoon
-%defattr(644,root,root,755)
-%doc AUTHORS COPYING README TODO NEWS
-%attr(755,root,root) %{_libdir}/libmoon.so.*
-
-%post -n libmoon -p /sbin/ldconfig
-%postun -n libmoon -p /sbin/ldconfig
-
 %package -n libmoon-devel
-######         Unknown group!
 Summary:       Development files for libmoon
 License:       LGPL v2.0 only
-Group:         Development/Languages/C and C++
+Group:         Libraries
 Requires:      mono-devel >= 2.6
 
 %description -n libmoon-devel
@@ -66,15 +53,10 @@ Development files for libmoon.
 Moonlight is an open source implementation of Microsoft Silverlight
 for Unix systems.
 
-%files -n libmoon-devel
-%defattr(644,root,root,755)
-%{_libdir}/libmoon.so
-
 %package plugin
-######         Unknown group!
 Summary:       Novell Moonlight Browser Plugin
 License:       LGPL v2.0 only ; MIT License (or similar) ; Ms-Pl
-Group:         Productivity/Multimedia/Other
+Group:         X11/Applications/Multimedia
 Requires:      libmoon0 == %{version}
 Requires:      mono-core >= 2.6
 
@@ -84,25 +66,6 @@ Novell Moonlight Browser Plugin.
 Moonlight is an open source implementation of Microsoft Silverlight
 for Unix systems.
 
-%files plugin
-%defattr(644,root,root,755)
-%dir %{_libdir}/moonlight/plugin
-%{_libdir}/moonlight/plugin/libmoonloader.so
-%{_libdir}/moonlight/plugin/libmoonplugin-ff3bridge.so
-%{_libdir}/moonlight/plugin/libmoonplugin.so
-%{_libdir}/moonlight/plugin/Microsoft.VisualBasic.dll*
-%{_libdir}/moonlight/plugin/System.Core.dll*
-%{_libdir}/moonlight/plugin/System.Net.dll*
-%{_libdir}/moonlight/plugin/System.Runtime.Serialization.dll*
-%{_libdir}/moonlight/plugin/System.ServiceModel.Web.dll*
-%{_libdir}/moonlight/plugin/System.ServiceModel.dll*
-%{_libdir}/moonlight/plugin/System.Windows.Browser.dll*
-%{_libdir}/moonlight/plugin/System.Windows.dll*
-%{_libdir}/moonlight/plugin/System.Xml.dll*
-%{_libdir}/moonlight/plugin/System.dll*
-%{_libdir}/moonlight/plugin/mscorlib.dll* # Is there somewhere we
-could put this that would be universal?
-%{_libdir}/browser-plugins/libmoonloader.so
 
 %package web-devel
 Summary:       Development files for Moonlight Web
@@ -116,39 +79,10 @@ Development files for creating Moonlight web applications.
 Moonlight is an open source implementation of Microsoft Silverlight
 for Unix systems.
 
-%files web-devel
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/smcs
-%dir %{_prefix}/lib/moonlight
-%dir %{_prefix}/lib/moonlight/2.0-redist
-%{_prefix}/lib/moonlight/2.0-redist/System.Windows.Controls.Data.dll*
-%{_prefix}/lib/moonlight/2.0-redist/System.Windows.Controls.dll*
-%{_prefix}/lib/moonlight/2.0-redist/System.Xml.Linq.dll*
-%dir %{_prefix}/lib/moonlight/2.0
-%{_prefix}/lib/moonlight/2.0/Microsoft.VisualBasic.dll*
-%{_prefix}/lib/moonlight/2.0-redist/System.Windows.Controls.dll*
-%{_prefix}/lib/moonlight/2.0-redist/System.Xml.Linq.dll*
-%{_prefix}/lib/moonlight/2.0/Mono.CompilerServices.SymbolWriter.dll*
-%{_prefix}/lib/moonlight/2.0/System.Core.dll*
-%{_prefix}/lib/moonlight/2.0/System.Net.dll*
-%{_prefix}/lib/moonlight/2.0/System.Runtime.Serialization.dll*
-%{_prefix}/lib/moonlight/2.0/System.ServiceModel.Web.dll*
-%{_prefix}/lib/moonlight/2.0/System.ServiceModel.dll*
-%{_prefix}/lib/moonlight/2.0/System.Windows.Browser.dll*
-%{_prefix}/lib/moonlight/2.0/System.Windows.dll*
-%{_prefix}/lib/moonlight/2.0/System.Xml.dll*
-%{_prefix}/lib/moonlight/2.0/System.dll*
-%{_prefix}/lib/moonlight/2.0/mscorlib.dll*
-%{_prefix}/lib/moonlight/2.0/respack.exe*
-%{_prefix}/lib/moonlight/2.0/smcs.exe*
-%{_prefix}/lib/moonlight/2.0/buildversion
-%{_datadir}/pkgconfig/moonlight-web-2.0.pc
-
 %package desktop
-######         Unknown group!
 Summary:       Mono bindings for Moonlight Desktop
 License:       MIT License (or similar) ; Ms-Pl
-Group:         Productivity/Multimedia/Other
+Group:         X11/Applications/Multimedia
 Requires:      libmoon0 == %{version}
 
 %description desktop
@@ -157,15 +91,6 @@ Mono bindings for Novell Moonlight.
 Moonlight is an open source implementation of Microsoft Silverlight
 for Unix systems.
 
-%files desktop
-%defattr(644,root,root,755)
-%{_prefix}/lib/mono/gac/Moon.Windows.Desktop
-%{_prefix}/lib/mono/gac/Moonlight.Gtk
-%{_prefix}/lib/mono/gac/System.Windows
-%{_prefix}/lib/mono/gac/System.Windows.Browser
-%{_prefix}/lib/mono/gac/System.Windows.Controls
-%{_prefix}/lib/mono/gac/System.Windows.Controls.Data
-
 %package desktop-devel
 Summary:       Development files for Moonlight Desktop
 License:       MIT License (or similar) ; Ms-Pl
@@ -182,21 +107,6 @@ Development files for Moonlight Desktop.
 Moonlight is an open source implementation of Microsoft Silverlight
 for Unix systems.
 
-%files desktop-devel
-%defattr(644,root,root,755)
-%dir %{_prefix}/lib/mono/moonlight
-%{_prefix}/lib/mono/moonlight/Moon.Windows.Desktop.dll*
-%{_prefix}/lib/mono/moonlight/System.Windows.Browser.dll*
-%{_prefix}/lib/mono/moonlight/System.Windows.Controls.Data.dll*
-%{_prefix}/lib/mono/moonlight/System.Windows.Controls.dll*
-%{_prefix}/lib/mono/moonlight/System.Windows.dll*
-%{_datadir}/pkgconfig/moonlight-desktop-2.0.pc # It may make sense in
-the future to have a moonlight-gtk package
-%{_prefix}/lib/mono/moonlight/Moonlight.Gtk.dll*
-%{_prefix}/lib/monodoc/sources/moonlight-gtk.source
-%{_prefix}/lib/monodoc/sources/moonlight-gtk.tree
-%{_prefix}/lib/monodoc/sources/moonlight-gtk.zip
-%{_datadir}/pkgconfig/moonlight-gtk-2.0.pc
 
 %package tools
 Summary:       Various tools for Novell Moonlight
@@ -211,27 +121,6 @@ Various tools for Novell Moonlight.
 Moonlight is an open source implementation of Microsoft Silverlight
 for Unix systems.
 
-%files tools
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/mopen
-%{_bindir}/munxap %{_bindir}/mxap %{_bindir}/respack
-%{_bindir}/sockpol %{_bindir}/unrespack %{_bindir}/xaml2html
-%{_bindir}/xamlg %{_mandir}/man1/mopen.1%ext_man
-%{_mandir}/man1/mxap.1%ext_man %{_mandir}/man1/respack.1%ext_man
-%{_mandir}/man1/sockpol.1%ext_man %{_mandir}/man1/svg2xaml.1%ext_man
-%{_mandir}/man1/xamlg.1%ext_man
-%dir %{_libdir}/moonlight
-%{_libdir}/moonlight/mopen.exe*
-%{_bindir}/munxap %{_bindir}/mxap %{_bindir}/respack
-%{_bindir}/sockpol %{_bindir}/unrespack %{_bindir}/xaml2html
-%{_bindir}/xamlg %{_mandir}/man1/mopen.1%ext_man
-%{_mandir}/man1/mxap.1%ext_man %{_mandir}/man1/respack.1%ext_man
-%{_mandir}/man1/sockpol.1%ext_man %{_mandir}/man1/svg2xaml.1%ext_man
-%{_mandir}/man1/xamlg.1%ext_man %{_libdir}/moonlight/munxap.exe*
-%{_libdir}/moonlight/mxap.exe* %{_libdir}/moonlight/respack.exe*
-%{_libdir}/moonlight/sockpol.exe* %{_libdir}/moonlight/xaml2html.exe*
-%{_libdir}/moonlight/xamlg.exe*
-
 %prep
 %setup -q
 %setup -q -T -D -b 1
@@ -239,7 +128,7 @@ for Unix systems.
 
 %build
 # The plugin requires a complete build of it's own mono
-pushd ../mono-%{included_mono}
+cd ../mono-%{included_mono}
 # We have not determined which --enable-minimal options might be safe
 # so please do not use any of them
 ./configure --prefix=%{_builddir}/install \
@@ -249,7 +138,8 @@ pushd ../mono-%{included_mono}
 # This gets installed in the build dir so that it gets wiped away
 # and not installed on the system
 %{__make} install
-popd
+cd -
+
 # And then we build moonlight
 # Only needed when there are Makefile.am or configure.ac patches
 #autoreconf -f -i -Wnone
@@ -275,3 +165,109 @@ find $RPM_BUILD_ROOT -name \*.la -delete
 
 %clean
 rm -rf $RPM_BUILD_ROOT
+
+%post  -n libmoon -p /sbin/ldconfig
+%postun        -n libmoon -p /sbin/ldconfig
+
+%files -n libmoon
+%defattr(644,root,root,755)
+%doc AUTHORS COPYING README TODO NEWS
+%attr(755,root,root) %{_libdir}/libmoon.so.*
+
+%files -n libmoon-devel
+%defattr(644,root,root,755)
+%{_libdir}/libmoon.so
+
+%files plugin
+%defattr(644,root,root,755)
+%dir %{_libdir}/moonlight/plugin
+%{_libdir}/moonlight/plugin/libmoonloader.so
+%{_libdir}/moonlight/plugin/libmoonplugin-ff3bridge.so
+%{_libdir}/moonlight/plugin/libmoonplugin.so
+%{_libdir}/moonlight/plugin/Microsoft.VisualBasic.dll*
+%{_libdir}/moonlight/plugin/System.Core.dll*
+%{_libdir}/moonlight/plugin/System.Net.dll*
+%{_libdir}/moonlight/plugin/System.Runtime.Serialization.dll*
+%{_libdir}/moonlight/plugin/System.ServiceModel.Web.dll*
+%{_libdir}/moonlight/plugin/System.ServiceModel.dll*
+%{_libdir}/moonlight/plugin/System.Windows.Browser.dll*
+%{_libdir}/moonlight/plugin/System.Windows.dll*
+%{_libdir}/moonlight/plugin/System.Xml.dll*
+%{_libdir}/moonlight/plugin/System.dll*
+# Is there somewhere we could put this that would be universal?
+%{_libdir}/moonlight/plugin/mscorlib.dll*
+%{_libdir}/browser-plugins/libmoonloader.so
+
+%files web-devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/smcs
+%dir %{_prefix}/lib/moonlight
+%dir %{_prefix}/lib/moonlight/2.0-redist
+%{_prefix}/lib/moonlight/2.0-redist/System.Windows.Controls.Data.dll*
+%{_prefix}/lib/moonlight/2.0-redist/System.Windows.Controls.dll*
+%{_prefix}/lib/moonlight/2.0-redist/System.Xml.Linq.dll*
+%dir %{_prefix}/lib/moonlight/2.0
+%{_prefix}/lib/moonlight/2.0/Microsoft.VisualBasic.dll*
+%{_prefix}/lib/moonlight/2.0-redist/System.Windows.Controls.dll*
+%{_prefix}/lib/moonlight/2.0-redist/System.Xml.Linq.dll*
+%{_prefix}/lib/moonlight/2.0/Mono.CompilerServices.SymbolWriter.dll*
+%{_prefix}/lib/moonlight/2.0/System.Core.dll*
+%{_prefix}/lib/moonlight/2.0/System.Net.dll*
+%{_prefix}/lib/moonlight/2.0/System.Runtime.Serialization.dll*
+%{_prefix}/lib/moonlight/2.0/System.ServiceModel.Web.dll*
+%{_prefix}/lib/moonlight/2.0/System.ServiceModel.dll*
+%{_prefix}/lib/moonlight/2.0/System.Windows.Browser.dll*
+%{_prefix}/lib/moonlight/2.0/System.Windows.dll*
+%{_prefix}/lib/moonlight/2.0/System.Xml.dll*
+%{_prefix}/lib/moonlight/2.0/System.dll*
+%{_prefix}/lib/moonlight/2.0/mscorlib.dll*
+%{_prefix}/lib/moonlight/2.0/respack.exe*
+%{_prefix}/lib/moonlight/2.0/smcs.exe*
+%{_prefix}/lib/moonlight/2.0/buildversion
+%{_datadir}/pkgconfig/moonlight-web-2.0.pc
+
+%files desktop
+%defattr(644,root,root,755)
+%{_prefix}/lib/mono/gac/Moon.Windows.Desktop
+%{_prefix}/lib/mono/gac/Moonlight.Gtk
+%{_prefix}/lib/mono/gac/System.Windows
+%{_prefix}/lib/mono/gac/System.Windows.Browser
+%{_prefix}/lib/mono/gac/System.Windows.Controls
+%{_prefix}/lib/mono/gac/System.Windows.Controls.Data
+
+%files desktop-devel
+%defattr(644,root,root,755)
+%dir %{_prefix}/lib/mono/moonlight
+%{_prefix}/lib/mono/moonlight/Moon.Windows.Desktop.dll*
+%{_prefix}/lib/mono/moonlight/System.Windows.Browser.dll*
+%{_prefix}/lib/mono/moonlight/System.Windows.Controls.Data.dll*
+%{_prefix}/lib/mono/moonlight/System.Windows.Controls.dll*
+%{_prefix}/lib/mono/moonlight/System.Windows.dll*
+# It may make sense in the future to have a moonlight-gtk package
+%{_datadir}/pkgconfig/moonlight-desktop-2.0.pc
+%{_prefix}/lib/mono/moonlight/Moonlight.Gtk.dll*
+%{_prefix}/lib/monodoc/sources/moonlight-gtk.source
+%{_prefix}/lib/monodoc/sources/moonlight-gtk.tree
+%{_prefix}/lib/monodoc/sources/moonlight-gtk.zip
+%{_datadir}/pkgconfig/moonlight-gtk-2.0.pc
+
+%files tools
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/mopen
+%{_bindir}/munxap %{_bindir}/mxap %{_bindir}/respack
+%{_bindir}/sockpol %{_bindir}/unrespack %{_bindir}/xaml2html
+%{_bindir}/xamlg %{_mandir}/man1/mopen.1%ext_man
+%{_mandir}/man1/mxap.1%ext_man %{_mandir}/man1/respack.1%ext_man
+%{_mandir}/man1/sockpol.1%ext_man %{_mandir}/man1/svg2xaml.1%ext_man
+%{_mandir}/man1/xamlg.1%ext_man
+%dir %{_libdir}/moonlight
+%{_libdir}/moonlight/mopen.exe*
+%{_bindir}/munxap %{_bindir}/mxap %{_bindir}/respack
+%{_bindir}/sockpol %{_bindir}/unrespack %{_bindir}/xaml2html
+%{_bindir}/xamlg %{_mandir}/man1/mopen.1%ext_man
+%{_mandir}/man1/mxap.1%ext_man %{_mandir}/man1/respack.1%ext_man
+%{_mandir}/man1/sockpol.1%ext_man %{_mandir}/man1/svg2xaml.1%ext_man
+%{_mandir}/man1/xamlg.1%ext_man %{_libdir}/moonlight/munxap.exe*
+%{_libdir}/moonlight/mxap.exe* %{_libdir}/moonlight/respack.exe*
+%{_libdir}/moonlight/sockpol.exe* %{_libdir}/moonlight/xaml2html.exe*
+%{_libdir}/moonlight/xamlg.exe*