diff --git a/meld.spec b/meld.spec index d9bc25a..c191f5f 100644 --- a/meld.spec +++ b/meld.spec @@ -1,6 +1,6 @@ Name: meld Version: 3.12.1 -Release: 1mamba +Release: 2mamba Summary: A visual diff and merge tool Group: System/Libraries Vendor: openmamba @@ -18,9 +18,8 @@ Requires: python Requires: patch Requires: pygobject Requires: pygtk -Requires: pygtksourceview +Requires: libgtksourceview BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildArch: noarch %description Meld is a visual diff and merge tool. @@ -42,45 +41,63 @@ CFLAGS="%{optflags}" %{__python} setup.py build --no-update-icon-cache \ --no-compile-schemas \ install \ - -O1 --skip-build \ + --prefix=%{_prefix} \ --root="%{buildroot}" \ + --optimize=1 \ --install-headers=%{_includedir}/python \ --install-lib=%{python_sitearch} \ --record=%{name}.filelist -# remove scrollkeeper files -rm -rf %{buildroot}%{_prefix}%{_localstatedir}/lib/scrollkeeper - -# install manual page -install -D -m0664 meld.1 \ - %{buildroot}%{_mandir}/man1/meld.1 - -#%find_lang %{name} +%find_lang %{name} %post if [ $1 -ge 1 ]; then glib-compile-schemas /usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor + update-desktop-database -q + update-mime-database /usr/share/mime &> /dev/null fi : %postun if [ $1 -eq 0 ]; then glib-compile-schemas /usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor + update-desktop-database -q + update-mime-database /usr/share/mime &> /dev/null fi : -%files -#-f %{name}.lang +%files -f %{name}.lang %defattr(-,root,root) %{_bindir}/meld -%{_datadir}/meld +%{_datadir}/icons/HighContrast/scalable/apps/meld.svg +%{_datadir}/icons/hicolor/* +%dir %{_datadir}/meld +%{_datadir}/meld/* +%{_datadir}/mime/packages/meld.xml +%{_datadir}/glib-2.0/schemas/org.gnome.meld.gschema.xml +%{_datadir}/appdata/meld.appdata.xml +%{_datadir}/applications/meld.desktop %{python_sitearch}/meld-%{version}-py*.egg-info %dir %{python_sitearch}/meld %{python_sitearch}/meld/* %{_mandir}/man1/* +%dir %{_datadir}/help/C/meld/ +%{_datadir}/help/C/meld/* +%lang(cs) %dir %{_datadir}/help/cs +%lang(cs) %{_datadir}/help/cs/* +%lang(el) %dir %{_datadir}/help/el +%lang(el) %{_datadir}/help/el/* +%lang(es) %dir %{_datadir}/help/es +%lang(es) %{_datadir}/help/es/* %doc COPYING %changelog +* Thu Nov 20 2014 Silvan Calarco 3.12.1-2mamba +- require libgtksourceview instead of pygtksourceview +- rebuilt adding install_data + * Fri Oct 31 2014 Silvan Calarco 3.12.1-1mamba - update to 3.12.1