Hello community, here is the log from the commit of package meld for openSUSE:Factory checked in at 2016-05-20 11:56:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/meld (Old) and /work/SRC/openSUSE:Factory/.meld.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "meld" Changes: -------- --- /work/SRC/openSUSE:Factory/meld/meld.changes 2016-05-03 10:17:02.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.meld.new/meld.changes 2016-05-20 11:56:06.000000000 +0200 @@ -1,0 +2,6 @@ +Wed May 18 12:39:39 UTC 2016 - [email protected] + +- Add meld-add_osc_to_vcs_list.patch: + + Add .osc folder to the list of files ignored as option 'VCS'. + +------------------------------------------------------------------- New: ---- meld-add_osc_to_vcs_list.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ meld.spec ++++++ --- /var/tmp/diff_new_pack.hWWKMj/_old 2016-05-20 11:56:07.000000000 +0200 +++ /var/tmp/diff_new_pack.hWWKMj/_new 2016-05-20 11:56:07.000000000 +0200 @@ -26,6 +26,8 @@ Source: http://download.gnome.org/sources/meld/3.16/%{name}-%{version}.tar.xz # PATCH-FIX-OPENSUSE meld-nodocs.patch [email protected] -- We do not want COPYING and NEWS installed like this Patch0: meld-nodocs.patch +# PATCH-FEATURE-OPENSUSE meld-add_osc_to_vcs_list.patch bgo#766617 [email protected] -- add .osc folder to the list of files ignored as VCS +Patch1: meld-add_osc_to_vcs_list.patch BuildRequires: fdupes # Needed for glib2_gsettings_schema macros BuildRequires: glib2-devel @@ -73,6 +75,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 translation-update-upstream %build ++++++ meld-add_osc_to_vcs_list.patch ++++++ diff -urEbwB meld-3.16.0/data/org.gnome.meld.gschema.xml meld-3.16.0.new/data/org.gnome.meld.gschema.xml --- meld-3.16.0/data/org.gnome.meld.gschema.xml 2016-04-15 22:43:53.000000000 +0200 +++ meld-3.16.0.new/data/org.gnome.meld.gschema.xml 2016-05-18 14:32:36.543865925 +0200 @@ -220,7 +220,7 @@ [ ("Backups", true, "#*# .#* ~* *~ *.{orig,bak,swp}"), ("OS-specific metadata", true, ".DS_Store ._* .Spotlight-V100 .Trashes Thumbs.db Desktop.ini"), - ("Version Control", true, "_MTN .bzr .svn .svn .hg .fslckout _FOSSIL_ .fos CVS _darcs .git .svn"), + ("Version Control", true, "_MTN .bzr .svn .svn .hg .fslckout _FOSSIL_ .fos CVS _darcs .git .svn .osc"), ("Binaries", true, "*.{pyc,a,obj,o,so,la,lib,dll,exe}"), ("Media", false, "*.{jpg,gif,png,bmp,wav,mp3,ogg,flac,avi,mpg,xcf,xpm}") ]
