diff --git a/meld.spec b/meld.spec index 0d3b68d..a26e566 100644 --- a/meld.spec +++ b/meld.spec @@ -1,5 +1,5 @@ Name: meld -Version: 1.8.4 +Version: 3.11.0 Release: 1mamba Summary: A visual diff and merge tool Group: System/Libraries @@ -30,19 +30,20 @@ You can browse and view a working copy from popular version control systems such %prep %setup -q -sed -i "s|update-mime-database|/bin/true|" Makefile -sed -i "s|update-desktop-database|/bin/true|" Makefile +#sed -i "s|update-mime-database|/bin/true|" Makefile +#sed -i "s|update-desktop-database|/bin/true|" Makefile %build -%make \ - prefix=%{_prefix} \ - libdir=%{_datadir} +CFLAGS="%{optflags}" %{__python} setup.py build %install [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" -%makeinstall \ - prefix=%{_prefix} \ - libdir=%{_datadir} +%{__python} setup.py install \ + -O1 --skip-build \ + --root="%{buildroot}" \ + --install-headers=%{_includedir}/python \ + --install-lib=%{python_sitearch} \ + --record=%{name}.filelist # remove scrollkeeper files rm -rf %{buildroot}%{_prefix}%{_localstatedir}/lib/scrollkeeper @@ -51,23 +52,23 @@ rm -rf %{buildroot}%{_prefix}%{_localstatedir}/lib/scrollkeeper install -D -m0664 meld.1 \ %{buildroot}%{_mandir}/man1/meld.1 -%find_lang %{name} +#%find_lang %{name} -%files -f %{name}.lang +%files +#-f %{name}.lang %defattr(-,root,root) %{_bindir}/meld %{_datadir}/meld -%{_datadir}/appdata/meld.appdata.xml -%{_datadir}/applications/meld.desktop -%{_datadir}/gnome/help/meld -%{_datadir}/icons/HighContrast/scalable/apps/meld.svg -%{_datadir}/mime/packages/meld.xml -%{_datadir}/omf/meld -%{_datadir}/icons/hicolor/*/apps/meld.* +%{python_sitearch}/meld-%{version}-py*.egg-info +%dir %{python_sitearch}/meld +%{python_sitearch}/meld/* %{_mandir}/man1/* %doc COPYING %changelog +* Sat Mar 08 2014 Automatic Build System 3.11.0-1mamba +- automatic version update by autodist + * Wed Jan 22 2014 Automatic Build System 1.8.4-1mamba - automatic version update by autodist