[packages/meld] - up to 3.12.0 - drop GNUMakefile patch (make/scrollkeeper no longer used) - drop version_control_pl
atler
atler at pld-linux.org
Sat Oct 4 18:40:44 CEST 2014
commit c13bafefcc309a3eb3b0679a2030ce4b90a8a045
Author: Jan Palus <atler at pld-linux.org>
Date: Sat Oct 4 18:35:55 2014 +0200
- up to 3.12.0
- drop GNUMakefile patch (make/scrollkeeper no longer used)
- drop version_control_plugins_glob patch (plugins loading redesigned)
meld-GNUmakefile.patch | 40 ----------------------
meld-version_control_plugins_glob.patch | 11 ------
meld.spec | 59 +++++++++++++++++----------------
3 files changed, 30 insertions(+), 80 deletions(-)
---
diff --git a/meld.spec b/meld.spec
index 93e3024..72dee70 100644
--- a/meld.spec
+++ b/meld.spec
@@ -4,28 +4,26 @@
Summary: Visual diff and merge tool
Summary(pl.UTF-8): Wizualne narzędzie do oglądania i włączania zmian (diff)
Name: meld
-Version: 1.8.6
+Version: 3.12.0
Release: 1
License: GPL
Group: Applications/Text
-Source0: http://ftp.gnome.org/pub/GNOME/sources/meld/1.8/%{name}-%{version}.tar.xz
-# Source0-md5: 872e6c28a7913f1eab1cacf27d6d1e5a
+Source0: http://ftp.gnome.org/pub/GNOME/sources/meld/3.12/%{name}-%{version}.tar.xz
+# Source0-md5: 9dbdb3306dc5d2415baeae3892bcec8e
Patch0: %{name}-desktop.patch
-Patch1: %{name}-GNUmakefile.patch
-Patch2: %{name}-version_control_plugins_glob.patch
URL: http://meld.sourceforge.net/
BuildRequires: gettext-devel
BuildRequires: intltool
+BuildRequires: itstool
BuildRequires: python-modules >= 2.5
BuildRequires: rpm-pythonprov
BuildRequires: rpmbuild(find_lang) >= 1.23
BuildRequires: rpmbuild(macros) >= 1.197
-BuildRequires: scrollkeeper
BuildRequires: tar >= 1:1.22
BuildRequires: xz
Requires(post,postun): desktop-file-utils
+Requires(post,postun): glib2 >= 1:2.26.0
Requires(post,postun): gtk-update-icon-cache
-Requires(post,postun): scrollkeeper
Requires: hicolor-icon-theme
Requires: python-pygobject >= 2.16
Requires: python-pygtk-gtk >= 2.14
@@ -54,57 +52,60 @@ zakładkami, pozwalający na otwieranie wielu plików diff naraz.
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
-%patch2 -p1
%build
-%{__make} \
- prefix=%{_prefix} \
- libdir=%{py_sitedir}
+%{__python} setup.py build
%install
rm -rf $RPM_BUILD_ROOT
-%{__make} install \
- DESTDIR=$RPM_BUILD_ROOT \
- prefix=%{_prefix} \
- libdir=%{py_sitedir}
-
-touch $RPM_BUILD_ROOT%{py_sitedir}/meld/__init__.py
-
-%py_comp $RPM_BUILD_ROOT%{py_sitedir}
-%py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
+%{__python} setup.py \
+ --no-compile-schemas \
+ --no-update-icon-cache \
+ install \
+ --optimize=2 \
+ --root=$RPM_BUILD_ROOT
%py_postclean
+%{__rm} -r $RPM_BUILD_ROOT/usr/share/doc/%{name}-%{version}
+
%find_lang %{name} --with-gnome --with-omf
%clean
rm -rf $RPM_BUILD_ROOT
%post
-%scrollkeeper_update_post
+%glib_compile_schemas
%update_desktop_database_post
%update_icon_cache hicolor
%postun
-%scrollkeeper_update_postun
%update_desktop_database_postun
%update_icon_cache hicolor
+%glib_compile_schemas
%files -f %{name}.lang
%defattr(644,root,root,755)
+%doc NEWS README
%attr(755,root,root) %{_bindir}/%{name}
-%dir %{py_sitedir}/%{name}
-%{py_sitedir}/%{name}/*.py[co]
-%{py_sitedir}/%{name}/%{name}
+%dir %{py_sitescriptdir}/meld-*.egg-info
+%dir %{py_sitescriptdir}/%{name}
+%{py_sitescriptdir}/%{name}/*.py[co]
+%dir %{py_sitescriptdir}/%{name}/ui
+%{py_sitescriptdir}/%{name}/ui/*.py[co]
+%dir %{py_sitescriptdir}/%{name}/util
+%{py_sitescriptdir}/%{name}/util/*.py[co]
+%dir %{py_sitescriptdir}/%{name}/vc
+%{py_sitescriptdir}/%{name}/vc/*.py[co]
+%{_iconsdir}/hicolor/*/actions/*.png
%{_iconsdir}/hicolor/*/apps/%{name}.png
%{_iconsdir}/hicolor/*/apps/%{name}.svg
+%{_iconsdir}/hicolor/*/apps/meld-version-control.png
%{_iconsdir}/HighContrast/scalable/apps/meld.svg
%{_datadir}/%{name}
%{_datadir}/appdata/meld.appdata.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.meld.gschema.xml
%{_datadir}/mime/packages/meld.xml
%{_desktopdir}/%{name}.desktop
-
-
-
+%{_mandir}/man1/%{name}.1*
diff --git a/meld-GNUmakefile.patch b/meld-GNUmakefile.patch
deleted file mode 100644
index a24f089..0000000
--- a/meld-GNUmakefile.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- meld-1.1.3/help/C/Makefile.orig 2006-02-01 22:54:56.000000000 +0100
-+++ meld-1.1.3/help/C/Makefile 2006-02-01 22:55:15.000000000 +0100
-@@ -10,7 +10,7 @@
-
- .PHONY : all
- all $(OMF_NAME).install : $(OMF_NAME)
-- scrollkeeper-preinstall $(INST_XML) $(OMF_NAME) $(OMF_NAME).install
-+ scrollkeeper-preinstall $(XML_DIR_)/meld.xml $(OMF_NAME) $(OMF_NAME).install
-
- .PHONY : install
- install : $(OMF_NAME).install
-@@ -18,7 +18,7 @@
- install -m 644 meld.xml $(XML_DIR_)/meld.xml
- install -m 644 figures/*.png $(XML_DIR_)/figures
- -install -m 644 $< $(OMF_DIR_)/$(OMF_NAME)
-- -scrollkeeper-update -p $(OMF_STATE) -o $(OMF_DIR_)
-+ -scrollkeeper-update -o $(OMF_DIR_)
-
- .PHONY : uninstall
- uninstall :
---- meld-1.1.3/help/es/Makefile.orig 2006-02-01 22:54:07.000000000 +0100
-+++ meld-1.1.3/help/es/Makefile 2006-02-01 22:54:48.000000000 +0100
-@@ -10,7 +10,7 @@
-
- .PHONY : all
- all $(OMF_NAME).install : $(OMF_NAME)
-- scrollkeeper-preinstall $(INST_XML) $(OMF_NAME) $(OMF_NAME).install
-+ scrollkeeper-preinstall $(XML_DIR_)/meld.xml $(OMF_NAME) $(OMF_NAME).install
-
- .PHONY : install
- install : $(OMF_NAME).install
-@@ -18,7 +18,7 @@
- install -m 644 meld.xml $(XML_DIR_)/meld.xml
- install -m 644 figures/*.png $(XML_DIR_)/figures
- -install -m 644 $< $(OMF_DIR_)/$(OMF_NAME)
-- -scrollkeeper-update -p $(OMF_STATE) -o $(OMF_DIR_)
-+ -scrollkeeper-update -o $(OMF_DIR_)
-
- .PHONY : uninstall
- uninstall :
diff --git a/meld-version_control_plugins_glob.patch b/meld-version_control_plugins_glob.patch
deleted file mode 100644
index c553a5b..0000000
--- a/meld-version_control_plugins_glob.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- meld-1.8.4/meld/vc/__init__.py.version_control_plugins_glob 2014-04-28 13:12:56.446767163 +0200
-+++ meld-1.8.4/meld/vc/__init__.py 2014-04-28 13:13:08.823971551 +0200
-@@ -30,7 +30,7 @@ from ._vc import DATA_NAME, DATA_STATE,
- def load_plugins():
- _vcdir = os.path.dirname(os.path.abspath(__file__))
- ret = []
-- for plugin in sorted(glob.glob(os.path.join(_vcdir, "[a-z]*.py"))):
-+ for plugin in sorted(glob.glob(os.path.join(_vcdir, "[a-z]*.pyc"))):
- modname = "meld.vc.%s" % os.path.basename(os.path.splitext(plugin)[0])
- ret.append( __import__(modname, globals(), locals(), "*") )
- return ret
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/meld.git/commitdiff/c13bafefcc309a3eb3b0679a2030ce4b90a8a045
More information about the pld-cvs-commit
mailing list