commit scratch for openSUSE:Factory
Hello community,
here is the log from the commit of package scratch for openSUSE:Factory checked
in at 2018-06-04 13:22:35
Comparing /work/SRC/openSUSE:Factory/scratch (Old)
and /work/SRC/openSUSE:Factory/.scratch.new (New)
Package is "scratch"
Mon Jun 4 13:22:35 2018 rev:8 rq:613839 version:2.4.1
Changes:
--- /work/SRC/openSUSE:Factory/scratch/scratch.changes 2018-01-25
12:41:18.228525653 +0100
+++ /work/SRC/openSUSE:Factory/.scratch.new/scratch.changes 2018-06-04
13:23:41.530067280 +0200
@@ -1,0 +2,12 @@
+Sat Jun 2 22:59:30 UTC 2018 - bjorn@gmail.com
+
+- Drop pkgconfig(gconf-2.0) BuildRequires: No longer needed, nor
+ used.
+- Run spec-cleaner, modernize spec.
+- Add conditional for update-desktop-files BuildRequires and
+ glib2_gsettings_schema_requires as well as post(un) handling of
+ glib2_gsettings_schema_post(un) and desktop_database_post(un),
+ andsuse_update_desktop_file macro, no longer needed on modern
+ releases of openSUSE.
+
+---
Other differences:
--
++ scratch.spec ++
--- /var/tmp/diff_new_pack.7kbN1e/_old 2018-06-04 13:23:42.050048240 +0200
+++ /var/tmp/diff_new_pack.7kbN1e/_new 2018-06-04 13:23:42.058047946 +0200
@@ -1,7 +1,7 @@
#
# spec file for package scratch
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -22,9 +22,9 @@
Version:2.4.1
Release:0
Summary:Extensible Text Editor for Elementary OS
-License:GPL-3.0+
+License:GPL-3.0-or-later
Group: Productivity/Text/Editors
-Url:https://launchpad.net/scratch
+URL:https://launchpad.net/scratch
Source:
https://launchpad.net/scratch/2.x/%{version}/+download/%{_name}-%{version}.tar.xz
# PATCH-FIX-UPSTREAM vala-0.36.patch -- Fix build with vala >= 0.36.
Patch0: scratch-2.4.1-vala-0.36.patch
@@ -36,8 +36,9 @@
BuildRequires: gcc-c++
BuildRequires: intltool
BuildRequires: pkgconfig
+%if 0%{?suse_version} < 1500
BuildRequires: update-desktop-files
-BuildRequires: pkgconfig(gconf-2.0)
+%endif
BuildRequires: pkgconfig(gee-0.8)
BuildRequires: pkgconfig(gio-2.0)
BuildRequires: pkgconfig(glib-2.0)
@@ -54,10 +55,12 @@
BuildRequires: pkgconfig(vapigen) >= 0.28.0
BuildRequires: pkgconfig(webkit2gtk-4.0) >= 2.10
BuildRequires: pkgconfig(zeitgeist-2.0)
+Recommends: %{name}-lang
Recommends: contractor
Recommends: zeitgeist
-Recommends: %{name}-lang
+%if 0%{?suse_version} < 1500
%glib2_gsettings_schema_requires
+%endif
%if 0%{?suse_version} > 1320 || 0%{?sle_version} >= 12
BuildRequires: pkgconfig(vte-2.91)
%else
@@ -121,10 +124,13 @@
%install
%cmake_install
+%if 0%{?suse_version} < 1500
%suse_update_desktop_file org.pantheon.scratch
+%endif
%fdupes %{buildroot}%{_datadir}/
%find_lang scratch-text-editor %{name}.lang
+%if 0%{?suse_version} < 1500
%post
%glib2_gsettings_schema_post
%desktop_database_post
@@ -132,14 +138,14 @@
%postun
%glib2_gsettings_schema_postun
%desktop_database_postun
+%endif
%post -n lib%{name}core%{sover} -p /sbin/ldconfig
-
%postun -n lib%{name}core%{sover} -p /sbin/ldconfig
%files
-%defattr(-,root,root)
-%doc COPYING HACKING
+%license COPYING
+%doc HACKING
%{_bindir}/%{name}-text-editor
%{_libdir}/%{name}/
%{_datadir}/%{name}/
@@ -149,14 +155,11 @@
%{_datadir}/appdata/org.pantheon.scratch.appdata.xml
%files lang -f %{name}.lang
-%defattr(-,root,root)
%files -n lib%{name}core%{sover}
-%defattr(-,root,root)
%{_libdir}/lib%{name}core.so.*
%files devel
-%defattr(-,root,root)
%{_libdir}/lib%{name}core.so
%{_libdir}/pkgconfig/%{name}core.pc
%{_datadir}/vala/vapi/%{name}core.*
commit scratch for openSUSE:Factory
Hello community,
here is the log from the commit of package scratch for openSUSE:Factory checked
in at 2018-01-25 12:41:04
Comparing /work/SRC/openSUSE:Factory/scratch (Old)
and /work/SRC/openSUSE:Factory/.scratch.new (New)
Package is "scratch"
Thu Jan 25 12:41:04 2018 rev:7 rq:569388 version:2.4.1
Changes:
--- /work/SRC/openSUSE:Factory/scratch/scratch.changes 2017-05-08
19:03:50.201171526 +0200
+++ /work/SRC/openSUSE:Factory/.scratch.new/scratch.changes 2018-01-25
12:41:18.228525653 +0100
@@ -1,0 +2,6 @@
+Wed Jan 24 06:36:56 UTC 2018 - avvi...@yandex.by
+
+- Fix build with granite >= 0.5 (scratch-2.4.1-gtk.patch)
+- Add contractor and zeitgeist dependencies
+
+---
New:
scratch-2.4.1-gtk.patch
Other differences:
--
++ scratch.spec ++
--- /var/tmp/diff_new_pack.SO31T9/_old 2018-01-25 12:41:19.784453012 +0100
+++ /var/tmp/diff_new_pack.SO31T9/_new 2018-01-25 12:41:19.788452826 +0100
@@ -28,6 +28,8 @@
Source:
https://launchpad.net/scratch/2.x/%{version}/+download/%{_name}-%{version}.tar.xz
# PATCH-FIX-UPSTREAM vala-0.36.patch -- Fix build with vala >= 0.36.
Patch0: scratch-2.4.1-vala-0.36.patch
+# PATCH-FIX-UPSTREAM gtk.patch -- Fix build with granite >= 0.5 (#159) (#87)
+Patch1: scratch-2.4.1-gtk.patch
BuildRequires: cmake >= 2.8
BuildRequires: ctags
BuildRequires: fdupes
@@ -52,6 +54,8 @@
BuildRequires: pkgconfig(vapigen) >= 0.28.0
BuildRequires: pkgconfig(webkit2gtk-4.0) >= 2.10
BuildRequires: pkgconfig(zeitgeist-2.0)
+Recommends: contractor
+Recommends: zeitgeist
Recommends: %{name}-lang
%glib2_gsettings_schema_requires
%if 0%{?suse_version} > 1320 || 0%{?sle_version} >= 12
@@ -94,6 +98,7 @@
%prep
%setup -q -n %{_name}-%{version}
%patch0 -p1
+%patch1 -p1
# Fails to compile https://bugs.launchpad.net/scratch/+bug/1456572
sed -e '/add_subdirectory (filemanager)/d;/filemanager/q1' \
++ scratch-2.4.1-gtk.patch ++
638 lines (skipped)
commit scratch for openSUSE:Factory
Hello community,
here is the log from the commit of package scratch for openSUSE:Factory checked
in at 2017-05-08 19:02:56
Comparing /work/SRC/openSUSE:Factory/scratch (Old)
and /work/SRC/openSUSE:Factory/.scratch.new (New)
Package is "scratch"
Mon May 8 19:02:56 2017 rev:6 rq:492907 version:2.4.1
Changes:
--- /work/SRC/openSUSE:Factory/scratch/scratch.changes 2017-04-11
09:39:29.565142419 +0200
+++ /work/SRC/openSUSE:Factory/.scratch.new/scratch.changes 2017-05-08
19:03:50.201171526 +0200
@@ -1,0 +2,7 @@
+Thu May 4 15:12:19 UTC 2017 - sor.ale...@meowr.ru
+
+- Synchronise scratch-2.4.1-vala-0.36.patch with
+ https://bazaar.launchpad.net/~elementary-apps/scratch/master/revision/1828
+ to restore Vala 0.35 or older compatibility.
+
+---
Other differences:
--
++ scratch.spec ++
--- /var/tmp/diff_new_pack.XWpvnA/_old 2017-05-08 19:03:51.105043838 +0200
+++ /var/tmp/diff_new_pack.XWpvnA/_new 2017-05-08 19:03:51.109043273 +0200
@@ -16,7 +16,7 @@
#
-%define major 0
+%define sover 0
%define _name scratch-text-editor
Name: scratch
Version:2.4.1
@@ -26,7 +26,7 @@
Group: Productivity/Text/Editors
Url:https://launchpad.net/scratch
Source:
https://launchpad.net/scratch/2.x/%{version}/+download/%{_name}-%{version}.tar.xz
-# PATCH-FIX-UPSTREAM vala-0.36.patch avvi...@yandex.by -- Fix build with vala
>= 0.36
+# PATCH-FIX-UPSTREAM vala-0.36.patch -- Fix build with vala >= 0.36.
Patch0: scratch-2.4.1-vala-0.36.patch
BuildRequires: cmake >= 2.8
BuildRequires: ctags
@@ -53,9 +53,8 @@
BuildRequires: pkgconfig(webkit2gtk-4.0) >= 2.10
BuildRequires: pkgconfig(zeitgeist-2.0)
Recommends: %{name}-lang
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
%glib2_gsettings_schema_requires
-%if 0%{?suse_version} >= 1315
+%if 0%{?suse_version} > 1320 || 0%{?sle_version} >= 12
BuildRequires: pkgconfig(vte-2.91)
%else
BuildRequires: pkgconfig(vte-2.90)
@@ -64,15 +63,17 @@
%description
Scratch is a GTK+-based text editor designed for Elementary OS. It
auto-saves files, and can remembers tabs and cursor positions. You
-can install extensions to turn Scratch into a full-blown IDE, as well
-as tweak the behavior and interface to your liking. It has
-highlighting for many programming, scriptnig and markup languages.
+can install extensions to turn Scratch into a full-blown IDE, as
+well as tweak the behaviour and interface to your liking. It has
+highlighting for many programming, scripting and markup languages.
-%package -n lib%{name}core%{major}
+%lang_package
+
+%package -n lib%{name}core%{sover}
Summary:Scratch Library
Group: System/Libraries
-%description -n lib%{name}core%{major}
+%description -n lib%{name}core%{sover}
Extensible Text Editor for Elementary OS.
This package contains the shared library.
@@ -81,31 +82,29 @@
Summary:Development Files for Scratch
Group: Development/Libraries/C and C++
Requires: %{name} = %{version}
-Requires: lib%{name}core%{major} = %{version}
+Requires: lib%{name}core%{sover} = %{version}
Recommends: pkgconfig(vapigen)
%descriptiondevel
Extensible Text Editor for Elementary OS.
This package contains development files needed to develop plugins for
-Scratch.
-
-%lang_package
+for Scratch.
%prep
%setup -q -n %{_name}-%{version}
%patch0 -p1
-# fails to compile https://bugs.launchpad.net/scratch/+bug/1456572
+# Fails to compile https://bugs.launchpad.net/scratch/+bug/1456572
sed -e '/add_subdirectory (filemanager)/d;/filemanager/q1' \
-e '/add_subdirectory (folder-manager)/d;/folder-manager/q1' \
-i ./plugins/CMakeLists.txt
-# fails to compile https://bugs.launchpad.net/scratch/+bug/1456580
+# Fails to compile https://bugs.launchpad.net/scratch/+bug/1456580
sed -e '/add_subdirectory (outline)/d;/outline/q1' \
-i ./plugins/CMakeLists.txt
-# fails to compile https://bugs.launchpad.net/scratch/+bug/1456581
+# Fails to compile https://bugs.launchpad.net/scratch/+bug/1456581
sed -e '/add_subdirectory (word-completion)/d;/word-completion/q1' \
-i ./plugins/CMakeLists.txt
@@ -113,13 +112,12 @@
%cmake \
-DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed" \
-DGSETTINGS_COMPILE=OFF
-
-make %{?_smp_mflags}
+make %{?_smp_mflags} V=1
%install
%cmake_install
%suse_update_desktop_file org.pantheon.scratch
-%fdupes %{buildroot}%{_datadir}
+%fdupes %{buildroot}%{_datadir}/
%find_lang scratch-text-editor %{name}.lang
%post
@@ -130,8 +128,9 @@
%glib2_gsettings_schema_postun
%desktop_database_postun
-%post -n lib%{name}core%{major} -p /sbin/ldconfig
commit scratch for openSUSE:Factory
Hello community,
here is the log from the commit of package scratch for openSUSE:Factory checked
in at 2017-04-11 09:39:28
Comparing /work/SRC/openSUSE:Factory/scratch (Old)
and /work/SRC/openSUSE:Factory/.scratch.new (New)
Package is "scratch"
Tue Apr 11 09:39:28 2017 rev:5 rq:484323 version:2.4.1
Changes:
--- /work/SRC/openSUSE:Factory/scratch/scratch.changes 2017-02-22
13:56:44.584926416 +0100
+++ /work/SRC/openSUSE:Factory/.scratch.new/scratch.changes 2017-04-11
09:39:29.565142419 +0200
@@ -1,0 +2,5 @@
+Sat Apr 1 00:05:50 UTC 2017 - avvi...@yandex.by
+
+- Fix build with vala >= 0.36 (scratch-2.4.1-vala-0.36.patch)
+
+---
New:
scratch-2.4.1-vala-0.36.patch
Other differences:
--
++ scratch.spec ++
--- /var/tmp/diff_new_pack.xHdhd2/_old 2017-04-11 09:39:30.177055979 +0200
+++ /var/tmp/diff_new_pack.xHdhd2/_new 2017-04-11 09:39:30.177055979 +0200
@@ -26,6 +26,8 @@
Group: Productivity/Text/Editors
Url:https://launchpad.net/scratch
Source:
https://launchpad.net/scratch/2.x/%{version}/+download/%{_name}-%{version}.tar.xz
+# PATCH-FIX-UPSTREAM vala-0.36.patch avvi...@yandex.by -- Fix build with vala
>= 0.36
+Patch0: scratch-2.4.1-vala-0.36.patch
BuildRequires: cmake >= 2.8
BuildRequires: ctags
BuildRequires: fdupes
@@ -92,6 +94,7 @@
%prep
%setup -q -n %{_name}-%{version}
+%patch0 -p1
# fails to compile https://bugs.launchpad.net/scratch/+bug/1456572
sed -e '/add_subdirectory (filemanager)/d;/filemanager/q1' \
++ scratch-2.4.1-vala-0.36.patch ++
diff -ruN
scratch-text-editor-2.4.1.orig/plugins/clipboard-history/ClipboardHistory.vala
scratch-text-editor-2.4.1/plugins/clipboard-history/ClipboardHistory.vala
---
scratch-text-editor-2.4.1.orig/plugins/clipboard-history/ClipboardHistory.vala
2017-02-20 14:37:19.0 +0300
+++ scratch-text-editor-2.4.1/plugins/clipboard-history/ClipboardHistory.vala
2017-04-01 04:10:46.360267441 +0300
@@ -90,7 +90,7 @@
// Delete last item, if the size of the list store > MAX_SIZE
if (list_store.get_iter_from_string (out iter, (MAX_SIZE -
1).to_string ()))
-list_store.remove (iter);
+list_store.remove (ref iter);
// Delete dupplicates from list store, if exists
delete_dupplicates (clipboard_content);
@@ -143,7 +143,7 @@
});
if (to_delete != null)
-list_store.remove (to_delete);
+list_store.remove (ref to_delete);
}
void build_plugin_ui () {
@@ -214,7 +214,7 @@
if (!selection.get_selected(out model, out iter)) {
return;
}
-list_store.remove (iter);
+list_store.remove (ref iter);
// Hiding PlugIn, if no more items exist in the list store.
if (!list_store.get_iter_first (out iter))
diff -ruN scratch-text-editor-2.4.1.orig/plugins/outline/OutlinePlugin.vala
scratch-text-editor-2.4.1/plugins/outline/OutlinePlugin.vala
--- scratch-text-editor-2.4.1.orig/plugins/outline/OutlinePlugin.vala
2017-02-20 14:37:19.0 +0300
+++ scratch-text-editor-2.4.1/plugins/outline/OutlinePlugin.vala
2017-04-01 04:08:56.268222463 +0300
@@ -139,7 +139,7 @@
var text = doc.source_view;
Gtk.TextIter iter;
text.buffer.get_iter_at_line (out iter, line - 1);
-text.buffer.place_cursor (iter);
+text.buffer.place_cursor (ref iter);
text.scroll_to_iter (iter, 0.0, true, 0.5, 0.5);
}
}
commit scratch for openSUSE:Factory
Hello community,
here is the log from the commit of package scratch for openSUSE:Factory checked
in at 2017-02-22 13:56:43
Comparing /work/SRC/openSUSE:Factory/scratch (Old)
and /work/SRC/openSUSE:Factory/.scratch.new (New)
Package is "scratch"
Changes:
--- /work/SRC/openSUSE:Factory/scratch/scratch.changes 2017-02-13
07:50:40.000989193 +0100
+++ /work/SRC/openSUSE:Factory/.scratch.new/scratch.changes 2017-02-22
13:56:44.584926416 +0100
@@ -1,0 +2,9 @@
+Mon Feb 20 16:50:09 UTC 2017 - avvi...@yandex.by
+
+- Update to 2.4.1:
+ * Launchpad automatic translations update.
+ * Make bracket autocompletion skip over closing brackets
+ * SplitView.vala: Restore old code that focuses the correct view
+ * Fix newly opened files being marked as unsaved
+
+---
Old:
scratch-text-editor-2.4.tar.xz
New:
scratch-text-editor-2.4.1.tar.xz
Other differences:
--
++ scratch.spec ++
--- /var/tmp/diff_new_pack.7OVWb1/_old 2017-02-22 13:56:45.456802386 +0100
+++ /var/tmp/diff_new_pack.7OVWb1/_new 2017-02-22 13:56:45.460801817 +0100
@@ -19,7 +19,7 @@
%define major 0
%define _name scratch-text-editor
Name: scratch
-Version:2.4
+Version:2.4.1
Release:0
Summary:Extensible Text Editor for Elementary OS
License:GPL-3.0+
++ scratch-text-editor-2.4.tar.xz -> scratch-text-editor-2.4.1.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/scratch-text-editor-2.4/CMakeLists.txt
new/scratch-text-editor-2.4.1/CMakeLists.txt
--- old/scratch-text-editor-2.4/CMakeLists.txt 2017-02-10 08:17:47.0
+0100
+++ new/scratch-text-editor-2.4.1/CMakeLists.txt2017-02-20
12:37:19.0 +0100
@@ -11,7 +11,7 @@
set (GETTEXT_PACKAGE "scratch-text-editor")
set (RELEASE_NAME "The elementary Text Editor.")
set (EXEC_NAME "scratch-text-editor")
-set (VERSION "2.4")
+set (VERSION "2.4.1")
set (VERSION_INFO "Release")
set (LIBNAME "scratchcore")
set (LIBVERSION "0")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/scratch-text-editor-2.4/plugins/brackets-completion/brackets-completion.vala
new/scratch-text-editor-2.4.1/plugins/brackets-completion/brackets-completion.vala
---
old/scratch-text-editor-2.4/plugins/brackets-completion/brackets-completion.vala
2017-02-10 08:17:47.0 +0100
+++
new/scratch-text-editor-2.4.1/plugins/brackets-completion/brackets-completion.vala
2017-02-20 12:37:19.0 +0100
@@ -71,7 +71,12 @@
return;
}
-if (new_text in this.brackets.keys && this.last_inserted != new_text) {
+// To avoid infinite loop
+if (this.last_inserted == new_text) {
+return;
+}
+
+if (new_text in this.brackets.keys) {
var buf = this.current_buffer;
string text = this.brackets.get (new_text);
@@ -84,6 +89,15 @@
pos.backward_chars (len);
buf.place_cursor (pos);
+} else if (new_text in this.brackets.values) { // Handle matching
closing brackets.
+var buf = this.current_buffer;
+var end_pos = pos;
+end_pos.forward_chars (1);
+
+if (new_text == buf.get_text (pos, end_pos, true)) {
+buf.delete (ref pos, ref end_pos);
+buf.place_cursor (pos);
+}
}
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/scratch-text-editor-2.4/po/el.po
new/scratch-text-editor-2.4.1/po/el.po
--- old/scratch-text-editor-2.4/po/el.po2017-02-10 08:17:47.0
+0100
+++ new/scratch-text-editor-2.4.1/po/el.po 2017-02-20 12:37:19.0
+0100
@@ -8,14 +8,14 @@
"Project-Id-Version: scratch\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2016-08-02 10:38-0700\n"
-"PO-Revision-Date: 2017-01-21 09:04+\n"
-"Last-Translator: Mario Guerriero \n"
+"PO-Revision-Date: 2017-02-10 11:23+\n"
+"Last-Translator: Christos Iatropoulos \n"
"Language-Team: Greek \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2017-01-22 05:38+\n"
-"X-Generator: Launchpad (build 18302)\n"
+"X-Launchpad-Export-Date: 2017-02-11 05:37+\n"
+"X-Generator: Launchpad (build 18326)\n"
#: ../src/MainWindow.vala:97
msgid "Zeitgeist Datasource for Scratch"
@@ -23,7 +23,7 @@
#: ../src/MainWindow.vala:187
msgid "Trash"
-msgstr "Απορρίμματα"
+msgstr "Κάδος"
#: ../src/MainWindow.vala:671
msgid "Open some files"
@@ -451,6 +451,7
commit scratch for openSUSE:Factory
Hello community,
here is the log from the commit of package scratch for openSUSE:Factory checked
in at 2017-02-13 07:50:29
Comparing /work/SRC/openSUSE:Factory/scratch (Old)
and /work/SRC/openSUSE:Factory/.scratch.new (New)
Package is "scratch"
Changes:
--- /work/SRC/openSUSE:Factory/scratch/scratch.changes 2017-01-22
00:15:43.805027481 +0100
+++ /work/SRC/openSUSE:Factory/.scratch.new/scratch.changes 2017-02-13
07:50:40.000989193 +0100
@@ -1,0 +2,26 @@
+Fri Feb 10 12:11:40 UTC 2017 - avvi...@yandex.by
+
+- Update to 2.4:
+ * Launchpad automatic translations update.
+ * Replace the granite appmenu widget with Gtk.Menu. This fixes
+window dragging
+ * MainWindow.vala: Add width request to set minimum sizes for
+panes
+ * Save and restore opened documents per view
+ * Prevent New Docs from not saving
+ * Fix word completion bug #1354251 preventing keyboard
+navigation when proposed word is typed
+ * Swap the position of the second view in the pane when we
+delete the first one.
+ * SplitView now return the focused child correctly.
+ * Fix problem with multiple signal connections on plugin toggle.
+ * Use Pantheon Terminal font settings
+ * Scratch Text Editor "org.pantheon.scratch":
+ * Fixed filenames to the AppID name.
+ * Fixed code to have it point to a new AppID.
+ * Use webkit2gtk4 instead of webkitgtk3
+ * Fixed Vala version not being retreived.
+ * Fix CMake warnings in the plugins
+- Spec file cleanup
+
+---
Old:
scratch-text-editor-2.3.tar.xz
New:
scratch-text-editor-2.4.tar.xz
Other differences:
--
++ scratch.spec ++
--- /var/tmp/diff_new_pack.bQ0gCe/_old 2017-02-13 07:50:40.824871572 +0100
+++ /var/tmp/diff_new_pack.bQ0gCe/_new 2017-02-13 07:50:40.828871002 +0100
@@ -1,7 +1,7 @@
#
# spec file for package scratch
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,7 +19,7 @@
%define major 0
%define _name scratch-text-editor
Name: scratch
-Version:2.3
+Version:2.4
Release:0
Summary:Extensible Text Editor for Elementary OS
License:GPL-3.0+
@@ -48,8 +48,9 @@
BuildRequires: pkgconfig(libpeas-gtk-1.0)
BuildRequires: pkgconfig(libsoup-2.4)
BuildRequires: pkgconfig(vapigen) >= 0.28.0
-BuildRequires: pkgconfig(webkitgtk-3.0)
+BuildRequires: pkgconfig(webkit2gtk-4.0) >= 2.10
BuildRequires: pkgconfig(zeitgeist-2.0)
+Recommends: %{name}-lang
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%glib2_gsettings_schema_requires
%if 0%{?suse_version} >= 1315
@@ -114,9 +115,9 @@
%install
%cmake_install
-%fdupes %{buildroot}%{_datadir}/locale
-
-%find_lang %{_name}
+%suse_update_desktop_file org.pantheon.scratch
+%fdupes %{buildroot}%{_datadir}
+%find_lang scratch-text-editor %{name}.lang
%post
%glib2_gsettings_schema_post
@@ -135,9 +136,9 @@
%{_bindir}/%{name}-text-editor
%{_libdir}/%{name}/
%{_datadir}/%{name}/
-%{_datadir}/applications/%{name}-text-editor.desktop
+%{_datadir}/applications/org.pantheon.scratch.desktop
%{_datadir}/glib-2.0/schemas/*.%{name}.*.xml
-%{_datadir}/appdata/scratch-text-editor.appdata.xml
+%{_datadir}/appdata/org.pantheon.scratch.appdata.xml
%dir %{_datadir}/appdata
%files -n lib%{name}core%{major}
@@ -151,7 +152,7 @@
%{_datadir}/vala/vapi/%{name}core.*
%{_includedir}/%{name}/
-%files lang -f %{_name}.lang
+%files lang -f %{name}.lang
%defattr(-,root,root,-)
%changelog
++ scratch-text-editor-2.3.tar.xz -> scratch-text-editor-2.4.tar.xz ++
10259 lines of diff (skipped)
commit scratch for openSUSE:Factory
Hello community,
here is the log from the commit of package scratch for openSUSE:Factory checked
in at 2017-01-22 00:15:42
Comparing /work/SRC/openSUSE:Factory/scratch (Old)
and /work/SRC/openSUSE:Factory/.scratch.new (New)
Package is "scratch"
Changes:
--- /work/SRC/openSUSE:Factory/scratch/scratch.changes 2016-11-14
20:12:42.0 +0100
+++ /work/SRC/openSUSE:Factory/.scratch.new/scratch.changes 2017-01-22
00:15:43.805027481 +0100
@@ -1,0 +2,5 @@
+Thu Nov 24 23:27:30 UTC 2016 - jeng...@inai.de
+
+- Trim empty words from description
+
+---
Other differences:
--
++ scratch.spec ++
--- /var/tmp/diff_new_pack.Ki9MbG/_old 2017-01-22 00:15:44.140979927 +0100
+++ /var/tmp/diff_new_pack.Ki9MbG/_new 2017-01-22 00:15:44.144979361 +0100
@@ -59,24 +59,11 @@
%endif
%description
-Scratch is a text editor designed for Elementary OS. Works and looks great
-on any GTK+ desktop. It auto-saves your files, meaning they're always
-up-to-date. Plus it remembers your tabs so you never lose your spot, even
-in between sessions.
-
-Scratch is written from the ground up to be extensible. Keep things super
-lightweight and simple, or install extensions to turn Scratch into a
-full-blown IDE; it's your choice. And with a handful of useful preferences,
-you can tweak the behavior and interface to your liking.
-
-Works with your language. Whether you're crafting code in Vala, scripting
-with PHP, or marking things up in HTML, Scratch has you covered. Experience
-full syntax highlighting with nearly all programming, scripting, and markup
-languages.
-
-Other syntax-highlighted languages: Bash, C, C#, C++. Cmake, CSS, .Desktop,
-Diff, Fortran, Gettext, ini, Java, JavaScript, LaTex, Lua, Makefile,
-Objective C, Pascal, Perl, Python, Ruby, XML.
+Scratch is a GTK+-based text editor designed for Elementary OS. It
+auto-saves files, and can remembers tabs and cursor positions. You
+can install extensions to turn Scratch into a full-blown IDE, as well
+as tweak the behavior and interface to your liking. It has
+highlighting for many programming, scriptnig and markup languages.
%package -n lib%{name}core%{major}
Summary:Scratch Library
