Hello community, here is the log from the commit of package florence for openSUSE:Factory checked in at 2013-12-16 15:52:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/florence (Old) and /work/SRC/openSUSE:Factory/.florence.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "florence" Changes: -------- --- /work/SRC/openSUSE:Factory/florence/florence.changes 2013-09-23 08:57:45.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.florence.new/florence.changes 2013-12-16 15:52:07.000000000 +0100 @@ -1,0 +2,11 @@ +Sun Dec 15 16:48:13 UTC 2013 - dap.darkn...@gmail.com + +- Added florence-icondir.patch: set correct svg icon directory in + order to not broke the app (bnc#855529). +- Add florence-rpmlintrc: filter warnings for duplicate files in + /usr/share/help/florence. Using fdupes could potentially cause + link targets to end up in the -lang package, not being installed + by default. As C lang help though is installed from the main + package, there is a chance of breakage. + +------------------------------------------------------------------- New: ---- florence-icondir.patch florence-rpmlintrc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ florence.spec ++++++ --- /var/tmp/diff_new_pack.XM7F71/_old 2013-12-16 15:52:08.000000000 +0100 +++ /var/tmp/diff_new_pack.XM7F71/_new 2013-12-16 15:52:08.000000000 +0100 @@ -24,8 +24,10 @@ Group: System/X11/Utilities Url: http://florence.sourceforge.net Source0: http://downloads.sourceforge.net/florence/%{name}-%{version}.tar.bz2 +Source99: florence-rpmlintrc +# PATCH-FIX-OPENSUSE florence-icondir.patch bnc#855529 dap.darkn...@gmail.com -- Set correct svg icon directory to not breake the application +Patch0: florence-icondir.patch BuildRequires: at-spi2-core-devel -BuildRequires: fdupes BuildRequires: intltool BuildRequires: libXtst-devel BuildRequires: librsvg2-devel @@ -56,8 +58,10 @@ to help disabled people having difficulties to click. %lang_package + %prep %setup -q +%patch0 sed -i 's|Icon=@ICONDIR@/%{name}.svg|Icon=%{name}|g' data/%{name}.desktop.in.in %build @@ -67,10 +71,6 @@ %install %make_install - -# a .svg is not really a pixmap and should not be installed there. -mkdir -p %{buildroot}%{_datadir}/icons/hicolor/scalable/apps -mv %{buildroot}%{_datadir}/pixmaps/%{name}.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps %suse_update_desktop_file -r %{name} Utility Accessibility %find_lang %{name} %{?no_lang_C} ++++++ florence-icondir.patch ++++++ --- configure.orig 2013-12-15 19:55:20.788000046 +0300 +++ configure 2013-12-15 19:55:20.816000053 +0300 @@ -8703,7 +8703,7 @@ # Files generated -ICONDIR=${prefix}/share/pixmaps +ICONDIR=${prefix}/share/icons/hicolor/scalable/apps if test "x$prefix" = "xNONE"; then ICONDIR=/usr/local/share/pixmaps fi --- configure.ac.orig 2013-12-15 19:55:19.125000058 +0300 +++ configure.ac 2013-12-15 19:55:19.126000054 +0300 @@ -132,7 +132,7 @@ AC_CHECK_FUNCS([setlocale memset memchr sscanf strcmp strrchr strchr strstr strcpy strncpy strcat atoi putenv fopen fclose fgets fputs lstat opendir readdir closedir]) # Files generated -ICONDIR=${prefix}/share/pixmaps +ICONDIR=${prefix}/share/icons/hicolor/scalable/apps if test "x$prefix" = "xNONE"; then ICONDIR=/usr/local/share/pixmaps fi --- data/Makefile.am.orig 2013-12-15 19:33:03.110000041 +0300 +++ data/Makefile.am 2013-12-15 19:33:03.128000026 +0300 @@ -13,7 +13,7 @@ $(desktop_in_files): $(desktop_in_files:.desktop.in=.desktop.in.in) sed -e "s|\@ICONDIR\@|$(ICONDIR)|" $< > $@ -iconsdir=$(datadir)/pixmaps +iconsdir=$(datadir)/icons/hicolor/scalable/apps icons_DATA=florence.svg gtkbuilderdir=$(datadir)/florence --- data/Makefile.in.orig 2013-12-15 19:31:57.703000027 +0300 +++ data/Makefile.in 2013-12-15 19:31:57.716000027 +0300 @@ -279,7 +279,7 @@ desktopdir = $(datadir)/applications desktop_in_files = florence.desktop.in desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) -iconsdir = $(datadir)/pixmaps +iconsdir = $(datadir)/icons/hicolor/scalable/apps icons_DATA = florence.svg gtkbuilderdir = $(datadir)/florence gtkbuilder_DATA = florence.glade --- data/styles/default/symbols.xml.orig 2013-12-15 19:24:07.199000014 +0300 +++ data/styles/default/symbols.xml 2013-12-15 19:24:07.224000012 +0300 @@ -9,7 +9,7 @@ </symbol> <symbol> <name>Super_[LR]</name> - <xi:include href="/usr/share/pixmaps/florence.svg"/> + <xi:include href="/usr/share/icons/hicolor/scalable/apps/florence.svg"/> </symbol> <symbol> <name>(Alt_[LR]|Meta_L)</name> ++++++ florence-rpmlintrc ++++++ # There is no guarantee that help content does not span multiple packages and the link target is in the main package addFilter('files-duplicate /usr/share/gnome/help/florence/'); -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
