Hello community, here is the log from the commit of package snapper for openSUSE:Factory checked in at 2017-12-16 20:46:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/snapper (Old) and /work/SRC/openSUSE:Factory/.snapper.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "snapper" Sat Dec 16 20:46:51 2017 rev:96 rq:556698 version:0.5.2 Changes: -------- --- /work/SRC/openSUSE:Factory/snapper/snapper.changes 2017-10-05 11:52:14.431850503 +0200 +++ /work/SRC/openSUSE:Factory/.snapper.new/snapper.changes 2017-12-16 20:47:07.759626451 +0100 @@ -1,0 +2,6 @@ +Thu Nov 23 13:51:45 UTC 2017 - rbr...@suse.com + +- Replace references to /var/adm/fillup-templates with new + %_fillupdir macro (boo#1069468) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ snapper.spec ++++++ --- /var/tmp/diff_new_pack.rczHcu/_old 2017-12-16 20:47:09.187557519 +0100 +++ /var/tmp/diff_new_pack.rczHcu/_new 2017-12-16 20:47:09.187557519 +0100 @@ -16,6 +16,11 @@ # +#Compat macro for new _fillupdir macro introduced in Nov 2017 +%if ! %{defined _fillupdir} + %define _fillupdir /var/adm/fillup-templates +%endif + Name: snapper Version: 0.5.2 Release: 0 @@ -105,7 +110,7 @@ rm -f "%{buildroot}/%{_libdir}"/*.la "%{buildroot}/%{_lib}/security/pam_snapper.la" %if 0%{?suse_version} -install -D -m 644 data/sysconfig.snapper "%{buildroot}/var/adm/fillup-templates/sysconfig.snapper" +install -D -m 644 data/sysconfig.snapper "%{buildroot}%{_fillupdir}/sysconfig.snapper" %else install -D -m 644 data/sysconfig.snapper "%{buildroot}/etc/sysconfig/snapper" %endif @@ -162,7 +167,7 @@ %doc %{_defaultdocdir}/snapper/AUTHORS %doc %{_defaultdocdir}/snapper/COPYING %if 0%{?suse_version} -/var/adm/fillup-templates/sysconfig.snapper +%{_fillupdir}/sysconfig.snapper %else %config(noreplace) %{_sysconfdir}/sysconfig/snapper %endif ++++++ debian.tar.gz ++++++ ++++++ snapper-0.5.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.5.2/Makefile.in new/snapper-0.5.2/Makefile.in --- old/snapper-0.5.2/Makefile.in 2017-10-02 13:57:59.000000000 +0200 +++ new/snapper-0.5.2/Makefile.in 2017-12-07 15:49:47.000000000 +0100 @@ -355,7 +355,6 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ -fillupdir = @fillupdir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.5.2/client/Makefile.in new/snapper-0.5.2/client/Makefile.in --- old/snapper-0.5.2/client/Makefile.in 2017-10-02 13:57:59.000000000 +0200 +++ new/snapper-0.5.2/client/Makefile.in 2017-12-07 15:49:47.000000000 +0100 @@ -381,7 +381,6 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ -fillupdir = @fillupdir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.5.2/client/utils/Makefile.in new/snapper-0.5.2/client/utils/Makefile.in --- old/snapper-0.5.2/client/utils/Makefile.in 2017-10-02 13:57:59.000000000 +0200 +++ new/snapper-0.5.2/client/utils/Makefile.in 2017-12-07 15:49:47.000000000 +0100 @@ -305,7 +305,6 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ -fillupdir = @fillupdir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.5.2/configure new/snapper-0.5.2/configure --- old/snapper-0.5.2/configure 2017-10-02 13:57:57.000000000 +0200 +++ new/snapper-0.5.2/configure 2017-12-07 15:49:45.000000000 +0100 @@ -634,7 +634,6 @@ am__EXEEXT_TRUE LTLIBOBJS LIBOBJS -fillupdir LIBVERSION_INFO LIBVERSION_PATCHLEVEL LIBVERSION_MINOR @@ -16484,8 +16483,6 @@ CFLAGS="${CFLAGS} -std=c99 -Wall -Wextra -Wformat=2 -Wmissing-prototypes -Wno-unused-parameter" CXXFLAGS="${CXXFLAGS} -std=c++11 -Wall -Wextra -Wformat=2 -Wnon-virtual-dtor -Wno-unused-parameter" -fillupdir=/var/adm/fillup-templates - # Check whether --with-conf was given. if test "${with_conf+set}" = set; then : @@ -17037,7 +17034,6 @@ - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.5.2/configure.ac new/snapper-0.5.2/configure.ac --- old/snapper-0.5.2/configure.ac 2017-01-13 19:37:56.000000000 +0100 +++ new/snapper-0.5.2/configure.ac 2017-12-07 15:49:20.000000000 +0100 @@ -58,8 +58,6 @@ CFLAGS="${CFLAGS} -std=c99 -Wall -Wextra -Wformat=2 -Wmissing-prototypes -Wno-unused-parameter" CXXFLAGS="${CXXFLAGS} -std=c++11 -Wall -Wextra -Wformat=2 -Wnon-virtual-dtor -Wno-unused-parameter" -fillupdir=/var/adm/fillup-templates - AC_ARG_WITH([conf], AC_HELP_STRING([--with-conf], [Use a custom sysconfig directory (default is /etc/sysconfig)]), [with_conf=$withval], [with_conf=no]) @@ -154,7 +152,6 @@ AC_SUBST(LIBVERSION_PATCHLEVEL) AC_SUBST(LIBVERSION_INFO) AC_SUBST(docdir) -AC_SUBST(fillupdir) AC_OUTPUT( Makefile diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.5.2/data/Makefile.in new/snapper-0.5.2/data/Makefile.in --- old/snapper-0.5.2/data/Makefile.in 2017-10-02 13:57:59.000000000 +0200 +++ new/snapper-0.5.2/data/Makefile.in 2017-12-07 15:49:47.000000000 +0100 @@ -237,7 +237,6 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ -fillupdir = @fillupdir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.5.2/dbus/Makefile.in new/snapper-0.5.2/dbus/Makefile.in --- old/snapper-0.5.2/dbus/Makefile.in 2017-10-02 13:57:59.000000000 +0200 +++ new/snapper-0.5.2/dbus/Makefile.in 2017-12-07 15:49:47.000000000 +0100 @@ -306,7 +306,6 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ -fillupdir = @fillupdir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.5.2/doc/Makefile.in new/snapper-0.5.2/doc/Makefile.in --- old/snapper-0.5.2/doc/Makefile.in 2017-10-02 13:57:59.000000000 +0200 +++ new/snapper-0.5.2/doc/Makefile.in 2017-12-07 15:49:47.000000000 +0100 @@ -278,7 +278,6 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ -fillupdir = @fillupdir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.5.2/examples/Makefile.in new/snapper-0.5.2/examples/Makefile.in --- old/snapper-0.5.2/examples/Makefile.in 2017-10-02 13:57:59.000000000 +0200 +++ new/snapper-0.5.2/examples/Makefile.in 2017-12-07 15:49:47.000000000 +0100 @@ -297,7 +297,6 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ -fillupdir = @fillupdir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.5.2/examples/c/Makefile.in new/snapper-0.5.2/examples/c/Makefile.in --- old/snapper-0.5.2/examples/c/Makefile.in 2017-10-02 13:57:59.000000000 +0200 +++ new/snapper-0.5.2/examples/c/Makefile.in 2017-12-07 15:49:47.000000000 +0100 @@ -290,7 +290,6 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ -fillupdir = @fillupdir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.5.2/examples/c++-lib/Makefile.in new/snapper-0.5.2/examples/c++-lib/Makefile.in --- old/snapper-0.5.2/examples/c++-lib/Makefile.in 2017-10-02 13:57:59.000000000 +0200 +++ new/snapper-0.5.2/examples/c++-lib/Makefile.in 2017-12-07 15:49:47.000000000 +0100 @@ -312,7 +312,6 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ -fillupdir = @fillupdir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.5.2/pam/Makefile.in new/snapper-0.5.2/pam/Makefile.in --- old/snapper-0.5.2/pam/Makefile.in 2017-10-02 13:57:59.000000000 +0200 +++ new/snapper-0.5.2/pam/Makefile.in 2017-12-07 15:49:47.000000000 +0100 @@ -320,7 +320,6 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ -fillupdir = @fillupdir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.5.2/po/Makefile.in new/snapper-0.5.2/po/Makefile.in --- old/snapper-0.5.2/po/Makefile.in 2017-10-02 13:58:00.000000000 +0200 +++ new/snapper-0.5.2/po/Makefile.in 2017-12-07 15:49:47.000000000 +0100 @@ -237,7 +237,6 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ -fillupdir = @fillupdir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.5.2/po/bg.po new/snapper-0.5.2/po/bg.po --- old/snapper-0.5.2/po/bg.po 2016-01-18 11:03:24.000000000 +0100 +++ new/snapper-0.5.2/po/bg.po 2017-10-30 00:02:40.000000000 +0100 @@ -3,18 +3,22 @@ "Project-Id-Version: @PACKAGE@\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-10-09 16:24+0200\n" -"PO-Revision-Date: 2005-08-18 21:16+0300\n" -"Last-Translator: Borislav Mitev <morbid_vi...@tkzs.org>\n" -"Language-Team: Bulgarian <b...@li.org>\n" +"PO-Revision-Date: 2017-10-29 20:52+0000\n" +"Last-Translator: strahil nikolov <hunter86...@yahoo.com>\n" +"Language-Team: Bulgarian " +"<https://l10n.opensuse.org/projects/snapper/master/bg/>\n" "Language: bg\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 2.13.1\n" #: ../client/snapper.cc:457 msgid "\t--all-configs, -a\t\tList snapshots from all accessible configs." msgstr "" +"\t--all-configs, -a Покажи всички снапшоти от всички достъпни " +"конфигурационни файлове." #: ../client/snapper.cc:698 ../client/snapper.cc:832 msgid "\t--cleanup-algorithm, -c <algo>\tCleanup algorithm for snapshot." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.5.2/po/es.po new/snapper-0.5.2/po/es.po --- old/snapper-0.5.2/po/es.po 2016-11-04 02:07:11.000000000 +0100 +++ new/snapper-0.5.2/po/es.po 2017-11-28 14:07:32.000000000 +0100 @@ -4,8 +4,8 @@ "Project-Id-Version: snapper\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-10-09 16:24+0200\n" -"PO-Revision-Date: 2016-11-03 22:17+0000\n" -"Last-Translator: jc sl <t...@gmx.com>\n" +"PO-Revision-Date: 2017-11-28 10:58+0000\n" +"Last-Translator: Arvin Schnell <aschn...@suse.com>\n" "Language-Team: Spanish " "<https://l10n.opensuse.org/projects/snapper/master/es/>\n" "Language: es\n" @@ -13,7 +13,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 2.6\n" +"X-Generator: Weblate 2.13.1\n" #: ../client/snapper.cc:457 msgid "\t--all-configs, -a\t\tList snapshots from all accessible configs." @@ -163,7 +163,7 @@ #: ../client/snapper.cc:1089 msgid "\tsnapper diff <number1>..<number2> [files]" -msgstr "\tsnapper diff <number1> <number2>" +msgstr "\tsnapper diff <número1>..<número2> [archivos]" #: ../client/snapper.cc:365 msgid "\tsnapper get-config" @@ -196,7 +196,7 @@ #: ../client/snapper.cc:1027 msgid "\tsnapper status <number1>..<number2>" -msgstr "\tsnapper diff <number1> <number2>" +msgstr "\tsnapper status <número1>..<número2>" #: ../client/snapper.cc:990 msgid "\tsnapper umount <number>" @@ -204,7 +204,7 @@ #: ../client/snapper.cc:1152 msgid "\tsnapper undochange <number1>..<number2> [files]" -msgstr "\tsnapper diff <number1> <number2>" +msgstr "\tsnapper undochange <número1>..<número2> [archivos]" #: ../client/snapper.cc:1474 msgid "\tsnapper xadiff <number1>..<number2> [files]" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.5.2/po/pt_BR.po new/snapper-0.5.2/po/pt_BR.po --- old/snapper-0.5.2/po/pt_BR.po 2016-11-24 18:37:13.000000000 +0100 +++ new/snapper-0.5.2/po/pt_BR.po 2017-11-09 23:07:18.000000000 +0100 @@ -9,7 +9,7 @@ "Project-Id-Version: @PACKAGE@\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-10-09 16:24+0200\n" -"PO-Revision-Date: 2016-11-24 12:19+0000\n" +"PO-Revision-Date: 2017-11-09 19:41+0000\n" "Last-Translator: Luiz Fernando Ranghetti <elcheviv...@gmail.com>\n" "Language-Team: Portuguese (Brazil) " "<https://l10n.opensuse.org/projects/snapper/master/pt_BR/>\n" @@ -18,7 +18,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Generator: Weblate 2.6\n" +"X-Generator: Weblate 2.13.1\n" #: ../client/snapper.cc:457 msgid "\t--all-configs, -a\t\tList snapshots from all accessible configs." @@ -26,15 +26,17 @@ #: ../client/snapper.cc:698 ../client/snapper.cc:832 msgid "\t--cleanup-algorithm, -c <algo>\tCleanup algorithm for snapshot." -msgstr "\t--cleanup-algorithm, -c <algoritmo>\tAlgoritmo de limpeza para o snapshot." +msgstr "" +"\t--cleanup-algorithm, -c <algoritmo>\tAlgoritmo de limpeza do instantâneo." #: ../client/snapper.cc:1303 msgid "\t--cleanup-algorithm, -c <algo>\tCleanup algorithm for snapshots." -msgstr "\t--cleanup-algorithm, -c <algoritmo>\tAlgoritmo de limpeza para snapshots." +msgstr "" +"\t--cleanup-algorithm, -c <algoritmo>\tAlgoritmo de limpeza dos instantâneos." #: ../client/snapper.cc:700 msgid "\t--command <command>\tRun command and create pre and post snapshots." -msgstr "\t--command <command>\tExecutar comando e criar pré e pós snapshots." +msgstr "\t--command <comando>\tExecutar comando e criar pré e pós instantâneos." #: ../client/snapper.cc:1583 msgid "\t--config, -c <name>\t\tSet name of config to use." @@ -42,11 +44,11 @@ #: ../client/snapper.cc:697 ../client/snapper.cc:831 msgid "\t--description, -d <description>\tDescription for snapshot." -msgstr "\t--description, -d <descrição>\tDescrição do snapshot." +msgstr "\t--description, -d <descrição>\tDescrição do instantâneo." #: ../client/snapper.cc:1302 msgid "\t--description, -d <description>\tDescription for snapshots." -msgstr "\t--description, -d <descrição>\tDescrição dos snapshots." +msgstr "\t--description, -d <descrição>\tDescrição dos instantâneos." #: ../client/snapper.cc:1093 msgid "\t--diff-cmd <command>\t\tCommand used for comparing files." @@ -82,15 +84,16 @@ #: ../client/snapper.cc:695 msgid "\t--pre-number <number>\t\tNumber of corresponding pre snapshot." -msgstr "\t--pre-number <número>\t\tNúmero do pré-snapshot correspondente." +msgstr "\t--pre-number <número>\t\tNúmero do pré instantâneo correspondente." #: ../client/snapper.cc:696 msgid "\t--print-number, -p\t\tPrint number of created snapshot." -msgstr "\t--print-number, -p\t\tNúmero de impressão do snapshot criado." +msgstr "\t--print-number, -p\t\tNúmero de impressão do instantâneo criado." #: ../client/snapper.cc:1301 msgid "\t--print-number, -p\t\tPrint number of second created snapshot." -msgstr "\t--print-number, -p\t\tNúmero de impressão do segundo snapshot criado." +msgstr "" +"\t--print-number, -p\t\tNúmero de impressão do segundo instantâneo criado." #: ../client/snapper.cc:1578 msgid "\t--quiet, -q\t\t\tSuppress normal output." @@ -114,19 +117,21 @@ #: ../client/snapper.cc:694 msgid "\t--type, -t <type>\t\tType for snapshot." -msgstr "\t--type, -t <tipo>\t\tTipo do snapshot." +msgstr "\t--type, -t <tipo>\t\tTipo do instantâneo." #: ../client/snapper.cc:456 msgid "\t--type, -t <type>\t\tType of snapshots to list." -msgstr "\t--type, -t <tipo>\t\tTipos de snapshot a listar." +msgstr "\t--type, -t <tipo>\t\tTipos do instantâneo a listar." #: ../client/snapper.cc:699 ../client/snapper.cc:833 msgid "\t--userdata, -u <userdata>\tUserdata for snapshot." -msgstr "\t--userdata, -u <dados_de_usuário>\tDados de usuário para o snapshot." +msgstr "" +"\t--userdata, -u <dados de usuário>\tDados de usuário para o instantâneo." #: ../client/snapper.cc:1304 msgid "\t--userdata, -u <userdata>\tUserdata for snapshots." -msgstr "\t--userdata, -u <userdata>\tDados do usuário para os snapshots." +msgstr "" +"\t--userdata, -u <dados de usuário>\tDados de usuário para os instantâneos." #: ../client/snapper.cc:1580 msgid "\t--utc\t\t\t\tDisplay dates and times in UTC." @@ -142,7 +147,7 @@ #: ../client/snapper.cc:1409 msgid "\tsnapper cleanup <cleanup-algorithm>" -msgstr "\tsnapper cleanup <algoritmo_de_limpeza>" +msgstr "\tsnapper cleanup <algoritmo de limpeza>" #: ../client/snapper.cc:691 msgid "\tsnapper create" @@ -250,15 +255,15 @@ #: ../client/snapper.cc:1408 msgid " Cleanup snapshots:" -msgstr " Limpar snapshots:" +msgstr " Limpar instantâneos:" #: ../client/snapper.cc:1473 msgid " Comparing snapshots extended attributes:" -msgstr " Comparando os atributos estendidos dos snapshots:" +msgstr " Comparando os atributos estendidos dos instantâneos:" #: ../client/snapper.cc:1026 ../client/snapper.cc:1088 msgid " Comparing snapshots:" -msgstr " Comparando snapshots:" +msgstr " Comparando os instantâneos:" #: ../client/snapper.cc:270 msgid " Create config:" @@ -266,7 +271,7 @@ #: ../client/snapper.cc:690 msgid " Create snapshot:" -msgstr " Criar snapshot:" +msgstr " Criar instantâneo:" #: ../client/snapper.cc:334 msgid " Delete config:" @@ -274,7 +279,7 @@ #: ../client/snapper.cc:880 msgid " Delete snapshot:" -msgstr " Remover snapshot:" +msgstr " Remover instantâneo:" #: ../client/snapper.cc:364 msgid " Get config:" @@ -286,15 +291,15 @@ #: ../client/snapper.cc:452 msgid " List snapshots:" -msgstr " Listar snapshots:" +msgstr " Listar instantâneos:" #: ../client/snapper.cc:827 msgid " Modify snapshot:" -msgstr " Alterar snapshot:" +msgstr " Alterar instantâneo:" #: ../client/snapper.cc:952 msgid " Mount snapshot:" -msgstr " Montar snapshot:" +msgstr " Montar instantâneo:" #: ../client/snapper.cc:1297 msgid " Rollback:" @@ -306,7 +311,7 @@ #: ../client/snapper.cc:989 msgid " Umount snapshot:" -msgstr " Desmontar snapshot:" +msgstr " Desmontar instantâneo:" #: ../client/snapper.cc:1151 msgid " Undo changes:" @@ -320,7 +325,7 @@ #: ../client/snapper.cc:1382 ../client/snapper.cc:1389 #, c-format msgid "(Snapshot %d.)" -msgstr "(Snapshot %d.)" +msgstr "(Instantâneo %d.)" #: ../client/snapper.cc:1787 ../client/errors.cc:85 msgid "ACL error." @@ -450,24 +455,24 @@ #: ../client/snapper.cc:1378 msgid "Creating read-only snapshot of current system." -msgstr "Criando o snapshot apenas leitura do sistema atual." +msgstr "Criando o instantâneo somente leitura do sistema atual." #: ../client/snapper.cc:1359 msgid "Creating read-only snapshot of default subvolume." -msgstr "Criando o snapshot apenas leitura do subvolume padrão." +msgstr "Criando o instantâneo somente leitura do subvolume padrão." #: ../client/snapper.cc:1367 msgid "Creating read-write snapshot of current subvolume." -msgstr "Criando o snapshot leitura e gravação do subvolume atual." +msgstr "Criando o instantâneo leitura e gravação do subvolume atual." #: ../client/snapper.cc:1385 #, c-format msgid "Creating read-write snapshot of snapshot %d." -msgstr "Criando o snapshot leitura e gravação do snapshot %d." +msgstr "Criando o instantâneo leitura e gravação do instantâneo %d." #: ../client/errors.cc:73 msgid "Creating snapshot failed." -msgstr "Falha ao criar o snapshot." +msgstr "Falha ao criar o instantâneo." #: ../client/snapper.cc:533 ../client/snapper.cc:581 msgid "Date" @@ -480,14 +485,14 @@ #: ../client/errors.cc:76 msgid "Deleting snapshot failed." -msgstr "Falha ao remover o snapshot." +msgstr "Falha ao remover o instantâneo." #: ../client/commands.cc:274 #, c-format msgid "Deleting snapshot from %s:" msgid_plural "Deleting snapshots from %s:" -msgstr[0] "Apagando instantâneo de %s:" -msgstr[1] "Apagando instantâneos de %s:" +msgstr[0] "Removendo instantâneo de %s:" +msgstr[1] "Removendo instantâneos de %s:" #: ../client/snapper.cc:536 ../client/snapper.cc:583 ../client/snapper.cc:631 msgid "Description" @@ -535,11 +540,11 @@ #: ../client/misc.cc:102 msgid "Identical snapshots." -msgstr "Snapshots idênticos." +msgstr "Instantâneos idênticos." #: ../client/errors.cc:52 msgid "Illegal Snapshot." -msgstr "Snapshot ilegal." +msgstr "Instantâneo ilegal." #: ../client/snapper.cc:1781 ../client/errors.cc:49 msgid "Invalid configdata." @@ -552,11 +557,11 @@ #: ../client/misc.cc:48 ../client/misc.cc:72 #, c-format msgid "Invalid snapshot '%s'." -msgstr "Snapshot inválido '%s'." +msgstr "Instantâneo inválido '%s'." #: ../client/misc.cc:93 ../client/snapper.cc:1193 msgid "Invalid snapshots." -msgstr "Snapshots inválidos." +msgstr "Instantâneo inválido." #: ../client/snapper.cc:299 msgid "Invalid subvolume." @@ -586,7 +591,9 @@ #: ../client/snapper.cc:1050 msgid "Maybe you forgot the delimiter '..' between the snapshot numbers." -msgstr "Talvez você não tenha incluído o delimitador \"..\" entre os números dos instantâneos." +msgstr "" +"Talvez você não tenha incluído o delimitador '..' entre os números dos " +"instantâneos." #: ../client/utils/GetOpts.cc:68 #, c-format @@ -604,7 +611,7 @@ #: ../client/misc.cc:88 msgid "Missing delimiter '..' between snapshot numbers." -msgstr "Delimitador \"..\" ausente entre os números dos instantâneos." +msgstr "Delimitador '..' ausente entre os números dos instantâneos." #: ../client/snapper.cc:778 msgid "Missing or invalid pre-number." @@ -647,16 +654,16 @@ #: ../client/snapper.cc:1393 #, c-format msgid "Setting default subvolume to snapshot %d." -msgstr "Configurando o subvolume padrão para o snapshot %d." +msgstr "Configurando o subvolume padrão para o instantâneo %d." #: ../client/misc.cc:55 #, c-format msgid "Snapshot '%u' not found." -msgstr "Snapshot '%u' não foi encontrado." +msgstr "Instantâneo '%u' não encontrado." #: ../client/errors.cc:61 msgid "Snapshot is in use." -msgstr "O snapshot está em uso." +msgstr "O instantâneo está em uso." #: ../client/snapper.cc:250 msgid "Subvolume" @@ -702,11 +709,11 @@ #: ../client/snapper.cc:750 msgid "Unknown type of snapshot." -msgstr "Tipo de snapshot desconhecido." +msgstr "Tipo de instantâneo desconhecido." #: ../client/snapper.cc:495 msgid "Unknown type of snapshots." -msgstr "Tipo de snapshots desconhecido." +msgstr "Tipo de instantâneo desconhecido." #: ../client/snapper.cc:1676 #, c-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.5.2/scripts/Makefile.in new/snapper-0.5.2/scripts/Makefile.in --- old/snapper-0.5.2/scripts/Makefile.in 2017-10-02 13:58:00.000000000 +0200 +++ new/snapper-0.5.2/scripts/Makefile.in 2017-12-07 15:49:47.000000000 +0100 @@ -267,7 +267,6 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ -fillupdir = @fillupdir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.5.2/server/Makefile.in new/snapper-0.5.2/server/Makefile.in --- old/snapper-0.5.2/server/Makefile.in 2017-10-02 13:58:00.000000000 +0200 +++ new/snapper-0.5.2/server/Makefile.in 2017-12-07 15:49:48.000000000 +0100 @@ -310,7 +310,6 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ -fillupdir = @fillupdir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.5.2/snapper/Makefile.in new/snapper-0.5.2/snapper/Makefile.in --- old/snapper-0.5.2/snapper/Makefile.in 2017-10-02 13:58:00.000000000 +0200 +++ new/snapper-0.5.2/snapper/Makefile.in 2017-12-07 15:49:48.000000000 +0100 @@ -380,7 +380,6 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ -fillupdir = @fillupdir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.5.2/snapper.spec.in new/snapper-0.5.2/snapper.spec.in --- old/snapper-0.5.2/snapper.spec.in 2017-08-17 12:32:20.000000000 +0200 +++ new/snapper-0.5.2/snapper.spec.in 2017-12-07 13:43:41.000000000 +0100 @@ -15,6 +15,10 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # +#Compat macro for new _fillupdir macro introduced in Nov 2017 +%if ! %{defined _fillupdir} + %define _fillupdir /var/adm/fillup-templates +%endif Name: snapper Version: @VERSION@ @@ -105,7 +109,7 @@ rm -f "%{buildroot}/%{_libdir}"/*.la "%{buildroot}/%{_lib}/security/pam_snapper.la" %if 0%{?suse_version} -install -D -m 644 data/sysconfig.snapper "%{buildroot}/var/adm/fillup-templates/sysconfig.snapper" +install -D -m 644 data/sysconfig.snapper "%{buildroot}%{_fillupdir}/sysconfig.snapper" %else install -D -m 644 data/sysconfig.snapper "%{buildroot}/etc/sysconfig/snapper" %endif @@ -162,7 +166,7 @@ %doc %{_defaultdocdir}/snapper/AUTHORS %doc %{_defaultdocdir}/snapper/COPYING %if 0%{?suse_version} -/var/adm/fillup-templates/sysconfig.snapper +%{_fillupdir}/sysconfig.snapper %else %config(noreplace) %{_sysconfdir}/sysconfig/snapper %endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.5.2/testsuite/Makefile.in new/snapper-0.5.2/testsuite/Makefile.in --- old/snapper-0.5.2/testsuite/Makefile.in 2017-10-02 13:58:00.000000000 +0200 +++ new/snapper-0.5.2/testsuite/Makefile.in 2017-12-07 15:49:48.000000000 +0100 @@ -523,7 +523,6 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ -fillupdir = @fillupdir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.5.2/testsuite-cmp/Makefile.in new/snapper-0.5.2/testsuite-cmp/Makefile.in --- old/snapper-0.5.2/testsuite-cmp/Makefile.in 2017-10-02 13:58:00.000000000 +0200 +++ new/snapper-0.5.2/testsuite-cmp/Makefile.in 2017-12-07 15:49:48.000000000 +0100 @@ -290,7 +290,6 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ -fillupdir = @fillupdir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.5.2/testsuite-real/Makefile.in new/snapper-0.5.2/testsuite-real/Makefile.in --- old/snapper-0.5.2/testsuite-real/Makefile.in 2017-10-02 13:58:00.000000000 +0200 +++ new/snapper-0.5.2/testsuite-real/Makefile.in 2017-12-07 15:49:48.000000000 +0100 @@ -402,7 +402,6 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ -fillupdir = @fillupdir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ ++++++ snapper-Debian_7.0.dsc ++++++ --- /var/tmp/diff_new_pack.rczHcu/_old 2017-12-16 20:47:09.739530872 +0100 +++ /var/tmp/diff_new_pack.rczHcu/_new 2017-12-16 20:47:09.739530872 +0100 @@ -11,4 +11,4 @@ # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -4129fcadbc5407a448bf3f649b72dfc2 571883 snapper-0.5.2.tar.bz2 +0bbe0351479be03d56415c4287050ead 571670 snapper-0.5.2.tar.bz2 ++++++ snapper-Debian_8.0.dsc ++++++ --- /var/tmp/diff_new_pack.rczHcu/_old 2017-12-16 20:47:09.755530100 +0100 +++ /var/tmp/diff_new_pack.rczHcu/_new 2017-12-16 20:47:09.767529521 +0100 @@ -11,4 +11,4 @@ # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -4129fcadbc5407a448bf3f649b72dfc2 571883 snapper-0.5.2.tar.bz2 +0bbe0351479be03d56415c4287050ead 571670 snapper-0.5.2.tar.bz2 ++++++ snapper-xUbuntu_14.04.dsc ++++++ --- /var/tmp/diff_new_pack.rczHcu/_old 2017-12-16 20:47:09.779528941 +0100 +++ /var/tmp/diff_new_pack.rczHcu/_new 2017-12-16 20:47:09.779528941 +0100 @@ -11,4 +11,4 @@ # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -4129fcadbc5407a448bf3f649b72dfc2 571883 snapper-0.5.2.tar.bz2 +0bbe0351479be03d56415c4287050ead 571670 snapper-0.5.2.tar.bz2 ++++++ snapper-xUbuntu_14.10.dsc ++++++ --- /var/tmp/diff_new_pack.rczHcu/_old 2017-12-16 20:47:09.799527976 +0100 +++ /var/tmp/diff_new_pack.rczHcu/_new 2017-12-16 20:47:09.799527976 +0100 @@ -11,4 +11,4 @@ # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -4129fcadbc5407a448bf3f649b72dfc2 571883 snapper-0.5.2.tar.bz2 +0bbe0351479be03d56415c4287050ead 571670 snapper-0.5.2.tar.bz2 ++++++ snapper-xUbuntu_15.04.dsc ++++++ --- /var/tmp/diff_new_pack.rczHcu/_old 2017-12-16 20:47:09.815527204 +0100 +++ /var/tmp/diff_new_pack.rczHcu/_new 2017-12-16 20:47:09.815527204 +0100 @@ -11,4 +11,4 @@ # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -4129fcadbc5407a448bf3f649b72dfc2 571883 snapper-0.5.2.tar.bz2 +0bbe0351479be03d56415c4287050ead 571670 snapper-0.5.2.tar.bz2 ++++++ snapper-xUbuntu_15.10.dsc ++++++ --- /var/tmp/diff_new_pack.rczHcu/_old 2017-12-16 20:47:09.831526431 +0100 +++ /var/tmp/diff_new_pack.rczHcu/_new 2017-12-16 20:47:09.831526431 +0100 @@ -11,4 +11,4 @@ # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -4129fcadbc5407a448bf3f649b72dfc2 571883 snapper-0.5.2.tar.bz2 +0bbe0351479be03d56415c4287050ead 571670 snapper-0.5.2.tar.bz2 ++++++ snapper-xUbuntu_16.04.dsc ++++++ --- /var/tmp/diff_new_pack.rczHcu/_old 2017-12-16 20:47:09.855525273 +0100 +++ /var/tmp/diff_new_pack.rczHcu/_new 2017-12-16 20:47:09.855525273 +0100 @@ -11,4 +11,4 @@ # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -4129fcadbc5407a448bf3f649b72dfc2 571883 snapper-0.5.2.tar.bz2 +0bbe0351479be03d56415c4287050ead 571670 snapper-0.5.2.tar.bz2 ++++++ snapper-xUbuntu_16.10.dsc ++++++ --- /var/tmp/diff_new_pack.rczHcu/_old 2017-12-16 20:47:09.875524307 +0100 +++ /var/tmp/diff_new_pack.rczHcu/_new 2017-12-16 20:47:09.875524307 +0100 @@ -11,4 +11,4 @@ # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -4129fcadbc5407a448bf3f649b72dfc2 571883 snapper-0.5.2.tar.bz2 +0bbe0351479be03d56415c4287050ead 571670 snapper-0.5.2.tar.bz2 ++++++ snapper-xUbuntu_17.04.dsc ++++++ --- /var/tmp/diff_new_pack.rczHcu/_old 2017-12-16 20:47:09.891523535 +0100 +++ /var/tmp/diff_new_pack.rczHcu/_new 2017-12-16 20:47:09.891523535 +0100 @@ -11,4 +11,4 @@ # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -4129fcadbc5407a448bf3f649b72dfc2 571883 snapper-0.5.2.tar.bz2 +0bbe0351479be03d56415c4287050ead 571670 snapper-0.5.2.tar.bz2