diff --git a/anjuta.changes b/anjuta.changes index a7068af..8788806 100644 --- a/anjuta.changes +++ b/anjuta.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Sun Feb 13 12:10:19 CET 2011 - vuntz@opensuse.org + +- Call relevant macros in %post/%postun: + + %desktop_database_post/postun because the package ships at + least one desktop file. + + %icon_theme_cache_post/postun because the package ships themed + icons. + + %mime_database_post/postun because the package ships a mime + type definition. +- Pass %{?no_lang_C} to %find_lang so that english documentation + can be packaged with the program, and not in the lang subpackage. +- Change Requires of lang subpackage to Recommends, since the + english documentation is not there anymore. +- Drop doc subpackage as it contained developer doc that should be + in the devel subpackage. + ------------------------------------------------------------------- Fri Jan 7 17:39:13 CET 2011 - vuntz@opensuse.org diff --git a/anjuta.spec b/anjuta.spec index 5869206..6bbdde3 100644 --- a/anjuta.spec +++ b/anjuta.spec @@ -20,6 +20,7 @@ Name: anjuta Version: 2.32.1.1 Release: 1 +# NOTE: on upgrade to a new upstream version, change the doc Obsoletes from <= to < License: GPLv2+ Summary: Versatile Integrated Development Environment for GNOME Url: http://anjuta.sourceforge.net/ @@ -58,7 +59,6 @@ BuildRequires: valgrind-devel %endif BuildRequires: vte-devel BuildRequires: pkgconfig(vala-0.10) -Requires: %{name}-lang = %{version} # Directly required by anjuta: Requires: autoconf Requires: autogen @@ -67,6 +67,7 @@ Requires: gettext Requires: libtool # libgda-sqlite is needed by the symbol-db plugin. See bnc#624924. Requires: libgda-sqlite +Recommends: %{name}-lang BuildRoot: %{_tmppath}/%{name}-%{version}-build %gconf_schemas_prereq @@ -104,6 +105,9 @@ License: GPLv2+ Summary: Versatile Integrated Development Environment for GNOME -- Development Files Group: Development/Tools/IDE Requires: %{name} = %{version} +Provides: %{name}-doc = %{version} +# Note: we keep <= (and a rpmlint warning...) until we get a version higher than 2.32.1.1 (when this provides/obsoletes was introduced) +Obsoletes: %{name}-doc <= %{version} %description devel Anjuta is a versatile Integrated Development Environment (IDE) for the @@ -114,21 +118,6 @@ an integrated Valgrind memory profiler, an integrated gprof performance profiler, a class generator, a powerful source editor, source browsing, and more. -%package doc -License: GPLv2+ -Summary: Versatile Integrated Development Environment for GNOME -- Developer Documentation -Group: Development/Tools/IDE -Requires: %{name} = %{version} - -%description doc -Anjuta is a versatile Integrated Development Environment (IDE) for the -GNOME desktop. It features a number of advanced programming facilities -includes project management, application wizards, an interactive -debugger, an integrated Glade UI designer, integrated Devhelp API help, -an integrated Valgrind memory profiler, an integrated gprof performance -profiler, a class generator, a powerful source editor, source browsing, -and more. - %lang_package %prep %setup -q @@ -150,10 +139,12 @@ make %{?jobs:-j%jobs} rm -r %{buildroot}%{_datadir}/doc DESTDIR=%{buildroot} mime-info-to-mime %suse_update_desktop_file anjuta -%find_lang anjuta -%find_lang anjuta-build-tutorial anjuta.lang -%find_lang anjuta-faqs anjuta.lang -%find_lang anjuta-manual anjuta.lang +%find_lang anjuta %{?no_lang_C} +# There's no translation for those yet. If build fails because of non-packaged +# translations, uncomment those lines. +#%%find_lang anjuta-build-tutorial %{?no_lang_C} anjuta.lang +#%%find_lang anjuta-faqs %{?no_lang_C} anjuta.lang +%find_lang anjuta-manual %{?no_lang_C} anjuta.lang %find_gconf_schemas find %{buildroot} -type f -name "*.la" -delete -print # Fix permissions @@ -170,15 +161,17 @@ rm -rf %{buildroot} %post /sbin/ldconfig -if test -x usr/bin/update-mime-database ; then - usr/bin/update-mime-database usr/share/mime >/dev/null -fi +%desktop_database_post +%icon_theme_cache_post +%icon_theme_cache_post gnome +%mime_database_post %postun /sbin/ldconfig -if test -x usr/bin/update-mime-database ; then - usr/bin/update-mime-database usr/share/mime >/dev/null -fi +%desktop_database_postun +%icon_theme_cache_postun +%icon_theme_cache_postun gnome +%mime_database_postun %posttrans -f %{name}.schemas_posttrans @@ -187,6 +180,17 @@ fi %files -f %{name}.schemas_list %defattr(-,root,root) %doc AUTHORS COPYING ChangeLog FUTURE NEWS README doc/ScintillaDoc.html TODO +%dir %{_datadir}/gnome/ +%dir %{_datadir}/gnome/help/ +%dir %{_datadir}/gnome/help/anjuta-build-tutorial/ +%doc %{_datadir}/gnome/help/anjuta-build-tutorial/C/ +%dir %{_datadir}/gnome/help/anjuta-faqs/ +%doc %{_datadir}/gnome/help/anjuta-faqs/C/ +%dir %{_datadir}/gnome/help/anjuta-manual/ +%doc %{_datadir}/gnome/help/anjuta-manual/C/ +%dir %{_datadir}/omf/ +%dir %{_datadir}/omf/anjuta-manual/ +%doc %{_datadir}/omf/anjuta-manual/anjuta-manual-C.omf %{_bindir}/* %{_libdir}/anjuta %{_libdir}/*.so.* @@ -194,7 +198,8 @@ fi %{_datadir}/applications/*.desktop %{_datadir}/mime/packages/*.xml %{_datadir}/pixmaps/anjuta -# Somehow I think that this is wrong. +# When removing the gnome icon theme icons, don't forget to remove the %%icon_theme_cache_post(un) call for them +# Somehow I think that this is wrong: %dir %{_datadir}/icons/gnome/*/mimetypes/ %{_datadir}/icons/gnome/*/mimetypes/*.png %{_datadir}/icons/gnome/scalable/mimetypes/*.svg @@ -209,14 +214,11 @@ fi %files devel %defattr(-, root, root) -%{_includedir}/libanjuta-1.0 +%doc %{_datadir}/gtk-doc/html/libanjuta/ +%{_includedir}/libanjuta-1.0/ %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc -%files doc -%defattr(-, root, root) -%{_datadir}/gtk-doc/html/libanjuta - %files lang -f %name.lang %changelog