- what's point of rebase if it gets screwed up every time?

diff --git a/gnupg2-am.patch b/gnupg2-am.patch
deleted file mode 100644 (file)
index 4afedba..0000000
--- a/gnupg2-am.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnupg-2.0.27/configure.ac.orig     2015-02-26 19:33:04.165415100 +0100
-+++ gnupg-2.0.27/configure.ac  2015-02-26 19:40:14.108730388 +0100
-@@ -62,7 +62,7 @@
- 
- AC_CONFIG_AUX_DIR(scripts)
- AC_CONFIG_SRCDIR(sm/gpgsm.c)
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS([config.h])
- AM_INIT_AUTOMAKE([serial-tests dist-bzip2 no-dist-gzip])
- AC_CANONICAL_HOST
- AB_INIT

diff --git a/gnupg2-info.patch b/gnupg2-info.patch
index 800f198018c79521afb2b27665b952ba27d87b73..03f7085f60d06b8e507be6e9335a6019bea36102 100644 (file)
--- a/gnupg2-info.patch
+++ b/gnupg2-info.patch
@@ -1,6 +1,6 @@
---- gnupg-2.0.17/doc/gnupg.texi.orig   2011-01-13 15:43:08.000000000 +0100
-+++ gnupg-2.0.17/doc/gnupg.texi        2011-01-14 16:54:40.626363293 +0100
-@@ -46,14 +46,14 @@
+--- gnupg-2.1.5/doc/gnupg.texi.orig    2015-06-13 22:28:58.864152110 +0200
++++ gnupg-2.1.5/doc/gnupg.texi 2015-06-13 23:01:28.427557018 +0200
+@@ -47,13 +47,13 @@
  @end copying
  
  
@@ -10,14 +10,13 @@
 -* gpg2: (gnupg).           OpenPGP encryption and signing tool.
 -* gpgsm: (gnupg).          S/MIME encryption and signing tool.
 -* gpg-agent: (gnupg).      The secret key daemon.
+-* dirmngr: (gnupg).        X.509 CRL and OCSP server.
+-* dirmngr-client: (gnupg). X.509 CRL and OCSP client.
 +* gpg2: (gnupg).                      OpenPGP encryption and signing tool
 +* gpgsm: (gnupg).                     S/MIME encryption and signing tool
 +* gpg-agent: (gnupg).                 The secret key daemon
- @ifset gpgtwoone
--* dirmngr: (gnupg).        X.509 CRL and OCSP server.
--* dirmngr-client: (gnupg). X.509 CRL and OCSP client.
 +* dirmngr: (gnupg).                   X.509 CRL and OCSP server
 +* dirmngr-client: (gnupg).            X.509 CRL and OCSP client
- @end ifset
  @end direntry
  
+ 

diff --git a/gnupg2-pl.po-update.patch b/gnupg2-pl.po-update.patch
index 26fe77800cf6c1d81313d7cfa478f52cc4558377..090dd2eec67138c0716a0cf0f94159ea1a4fc5fa 100644 (file)
--- a/gnupg2-pl.po-update.patch
+++ b/gnupg2-pl.po-update.patch
@@ -1,117 +1,72 @@
---- gnupg-2.0.30/po/pl.po.orig 2016-03-31 12:49:13.000000000 +0200
-+++ gnupg-2.0.30/po/pl.po      2016-04-18 19:59:02.489174371 +0200
-@@ -38,42 +38,32 @@
- msgstr "|pinentry-label|_Anuluj"
+--- gnupg-2.0.24/po/pl.po.orig 2014-06-24 15:07:11.000000000 +0200
++++ gnupg-2.0.24/po/pl.po      2014-06-29 20:30:21.654338043 +0200
+@@ -441,10 +441,8 @@
+ msgstr "nie u¿ywanie pamiêci PIN-ów przy podpisywaniu"
  
- #: agent/call-pinentry.c:430
+ #: agent/gpg-agent.c:189
 -#, fuzzy
--#| msgid "|pinentry-label|_OK"
- msgid "|pinentry-label|_Yes"
--msgstr "|pinentry-label|_OK"
-+msgstr "|pinentry-label|_Tak"
+-#| msgid "allow clients to mark keys as \"trusted\""
+ msgid "disallow clients to mark keys as \"trusted\""
+-msgstr "zezwolenie klientom na oznaczanie kluczy jako \"zaufanych\""
++msgstr "brak zezwolenia dla klientów na oznaczanie kluczy jako \"zaufanych\""
  
- #: agent/call-pinentry.c:431
--#, fuzzy
--#| msgid "|pinentry-label|_OK"
- msgid "|pinentry-label|_No"
--msgstr "|pinentry-label|_OK"
-+msgstr "|pinentry-label|_Nie"
- 
- #: agent/call-pinentry.c:432
- msgid "|pinentry-label|PIN:"
- msgstr "|pinentry-label|PIN:"
- 
- #: agent/call-pinentry.c:433
--#, fuzzy
--#| msgid "|pinentry-label|_Cancel"
- msgid "|pinentry-label|_Save in password manager"
--msgstr "|pinentry-label|_Anuluj"
-+msgstr "|pinentry-label|_Zapisz w zarządcy haseł"
- 
- #: agent/call-pinentry.c:434
--#, fuzzy
--#| msgid "Do you really want to revoke the selected subkeys? (y/N) "
- msgid "Do you really want to make your passphrase visible on the screen?"
--msgstr "Czy na pewno chcesz unieważnić wybrane podklucze? (t/N) "
-+msgstr "Czy na pewno uwidocznić hasło na ekranie?"
+ #: agent/gpg-agent.c:192
+ msgid "allow presetting passphrase"
+@@ -452,11 +450,11 @@
  
- #: agent/call-pinentry.c:436
- msgid "|pinentry-tt|Make passphrase visible"
+ #: agent/gpg-agent.c:193
+ msgid "enable ssh support"
 -msgstr ""
-+msgstr "|pinentry-tt|Pokaż hasło"
- 
- #: agent/call-pinentry.c:437
--#, fuzzy
--#| msgid "Enter new passphrase"
- msgid "|pinentry-tt|Hide passphrase"
--msgstr "Wprowadź nowe hasło"
-+msgstr "|pinentry-tt|Ukryj hasło"
++msgstr "w³±czenie obs³ugi ssh"
  
- #. TRANSLATORS: This string is displayed by Pinentry as the label
- #. for the quality bar.
-@@ -491,10 +481,8 @@
- msgstr "włączenie obsługi putty"
- 
- #: agent/gpg-agent.c:203
--#, fuzzy
--#| msgid "do not allow the reuse of old passphrases"
- msgid "disallow the use of an external password cache"
--msgstr "nie zezwalanie na ponowne użycie starych haseł"
-+msgstr "niezezwalanie na użycie zewnętrznej pamięci haseł"
+ #: agent/gpg-agent.c:196
+ msgid "enable putty support"
+-msgstr ""
++msgstr "w³±czenie obs³ugi putty"
  
- #: agent/gpg-agent.c:205
+ #: agent/gpg-agent.c:202
  msgid "|FILE|write environment settings also to FILE"
-@@ -4078,13 +4066,11 @@
+@@ -2919,14 +2917,13 @@
+ msgstr "klucz %s: brak identyfikatora u¿ytkownika\n"
  
- #: g10/keyedit.c:3133
- msgid "WARNING: Your encryption subkey expires soon.\n"
--msgstr ""
-+msgstr "UWAGA: Podklucz szyfrujący wkrótce wygaśnie.\n"
+ #: g10/import.c:804
+-#, fuzzy, c-format
+-#| msgid "skipped \"%s\": %s\n"
++#, c-format
+ msgid "key %s: %s\n"
+-msgstr "pominiêty ,,%s'': %s\n"
++msgstr "klucz %s: %s\n"
  
- #: g10/keyedit.c:3134
--#, fuzzy
--#| msgid "You can't change the expiration date of a v3 key\n"
- msgid "You may want to change its expiration date too.\n"
--msgstr "Nie można zmienić daty ważności klucza w wersji 3.\n"
-+msgstr "Można też zmienić jego datę wygaśnięcia.\n"
+ #: g10/import.c:805 g10/import.c:1206
+ msgid "rejected by import filter"
+-msgstr ""
++msgstr "odrzucony przez filtr importu"
  
- #: g10/keyedit.c:3195
- msgid ""
-@@ -4931,10 +4917,9 @@
- msgstr "       Odcisk klucza ="
+ #: g10/import.c:834
+ #, c-format
+@@ -3049,10 +3046,9 @@
+ msgstr "klucz %s: ,,%s'' bez zmian\n"
  
- #: g10/keylist.c:1599 g10/keylist.c:1601
+ #: g10/import.c:1205
 -#, fuzzy, c-format
--#| msgid "WARNING: using experimental digest algorithm %s\n"
+-#| msgid "secret key \"%s\" not found: %s\n"
 +#, c-format
- msgid "WARNING: a PGP-2 fingerprint is not safe\n"
--msgstr "OSTRZEŻENIE: użycie eksperymentalnego algorytmu skrótu %s\n"
-+msgstr "OSTRZEŻENIE: odciski PGP-2 nie są bezpieczne\n"
- 
- #: g10/keylist.c:1618
- msgid "      Card serial no. ="
-@@ -6737,10 +6722,8 @@
- msgstr "brak argumentu"
- 
- #: jnlib/argparse.c:205
--#, fuzzy
--#| msgid "invalid value\n"
- msgid "invalid argument"
--msgstr "niepoprawna wartość\n"
-+msgstr "błędny argument"
+ msgid "secret key %s: %s\n"
+-msgstr "klucz prywatny ,,%s'' nie zosta³ odnaleziony: %s\n"
++msgstr "klucz prywatny %s: %s\n"
  
- #: jnlib/argparse.c:207
- msgid "invalid command"
-@@ -6764,10 +6747,9 @@
- msgstr "brak argumentu dla opcji ,,%.50s''\n"
+ #: g10/import.c:1225 g10/import.c:1248
+ msgid "importing secret keys not allowed\n"
+@@ -6148,10 +6144,9 @@
+ msgstr "UWAGA: klucz podpisuj±cy %s zosta³ uniewa¿niony\n"
  
- #: jnlib/argparse.c:223
+ #: g10/sig-check.c:280
 -#, fuzzy, c-format
--#| msgid "missing argument for option \"%.50s\"\n"
+-#| msgid "%s signature, digest algorithm %s\n"
 +#, c-format
- msgid "invalid argument for option \"%.50s\"\n"
--msgstr "brak argumentu dla opcji ,,%.50s''\n"
-+msgstr "błędny argument dla opcji ,,%.50s''\n"
+ msgid "Note: signatures using the %s algorithm are rejected\n"
+-msgstr "podpis %s, skrót %s\n"
++msgstr "Uwaga: podpisy wykonane algorytmem %s s± odrzucane\n"
  
- #: jnlib/argparse.c:225
+ #: g10/sig-check.c:341
  #, c-format

diff --git a/gnupg2-pth.patch b/gnupg2-pth.patch
deleted file mode 100644 (file)
index c2b02af..0000000
--- a/gnupg2-pth.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- gnupg-1.9.16/scd/command.c.orig    2005-04-20 12:23:46.000000000 +0200
-+++ gnupg-1.9.16/scd/command.c 2005-04-23 18:40:53.481725240 +0200
-@@ -26,6 +26,11 @@
- #include <ctype.h>
- #include <unistd.h>
- #include <signal.h>
-+#ifdef HAVE_OPENSC
-+# ifdef USE_GNU_PTH
-+#  undef USE_GNU_PTH
-+# endif
-+#endif
- #ifdef USE_GNU_PTH
- # include <pth.h>
- #endif

diff --git a/gnupg2.spec b/gnupg2.spec
index 703ef272dc8265fa066656ee4e41ba07a63c8542..45499f32c598b7a5962ee88c2739521c57cc1c69 100644 (file)
--- a/gnupg2.spec
+++ b/gnupg2.spec
@@ -20,7 +20,6 @@ Patch0:               %{name}-info.patch
 Patch1:                %{name}-nogit.patch
 Patch2:                %{name}-disable_tests.patch
 Patch3:                %{name}-pl.po-update.patch
-Patch4:                %{name}-am.patch
 URL:           http://www.gnupg.org/
 BuildRequires: autoconf >= 2.61
 BuildRequires: automake >= 1:1.14
@@ -39,6 +38,7 @@ BuildRequires:        npth-devel >= 1.2
 BuildRequires: pkgconfig
 BuildRequires: readline-devel
 BuildRequires: rpmbuild(macros) >= 1.177
+BuildRequires: sqlite3-devel >= 3.7
 BuildRequires: texinfo
 BuildRequires: zlib-devel
 Requires:      gnupg2-common = %{version}-%{release}
@@ -94,68 +94,6 @@ Common files used by tools from GnuPG project.
 %description common -l pl.UTF-8
 Pliki wspólne używane przez różne narzędzia z projektu GnuPG.
 
-%package plugin-keys_curl
-Summary:       GnuPG 2 plugin for allow talk to a HTTP/FTP keyserver
-Summary(pl.UTF-8):     Wtyczka GnuPG 2 pozwalająca komunikować się z serwerem kluczy HTTP/FTP
-Group:         Applications/File
-Requires:      %{name}-common = %{version}-%{release}
-Requires:      curl-libs >= 7.10
-
-%description plugin-keys_curl
-GnuPG 2 plugin for allow talk to a HTTP(S)/FTP(S) keyserver.
-
-%description plugin-keys_curl -l pl.UTF-8
-Wtyczka GnuPG 2 pozwalająca komunikować się z serwerem kluczy
-HTTP(S)/FTP(S).
-
-%package plugin-keys_finger
-Summary:       GnuPG 2 plugin for allow talk to a FINGER keyserver
-Summary(pl.UTF-8):     Wtyczka GnuPG 2 pozwalająca komunikować się z serwerem kluczy FINGER
-Group:         Applications/File
-Requires:      %{name}-common = %{version}-%{release}
-
-%description plugin-keys_finger
-GnuPG 2 plugin for allow talk to a FINGER keyserver.
-
-%description plugin-keys_finger -l pl.UTF-8
-Wtyczka 2 GnuPG pozwalająca komunikować się z serwerem kluczy FINGER.
-
-%package plugin-keys_hkp
-Summary:       GnuPG 2 plugin for allow talk to a HKP keyserver
-Summary(pl.UTF-8):     Wtyczka GnuPG 2 pozwalająca komunikować się z serwerem kluczy HKP
-Group:         Applications/File
-Requires:      %{name}-common = %{version}-%{release}
-
-%description plugin-keys_hkp
-GnuPG 2 plugin for allow talk to a HKP keyserver.
-
-%description plugin-keys_hkp -l pl.UTF-8
-Wtyczka GnuPG 2 pozwalająca komunikować się z serwerem kluczy HKP.
-
-%package plugin-keys_kdns
-Summary:       GnuPG 2 plugin for allow talk to a KDNS keyserver
-Summary(pl.UTF-8):     Wtyczka GnuPG 2 pozwalająca komunikować się z serwerem kluczy KDNS
-Group:         Applications/File
-Requires:      %{name}-common = %{version}-%{release}
-
-%description plugin-keys_kdns
-GnuPG 2 plugin for allow talk to a KDNS keyserver.
-
-%description plugin-keys_kdns -l pl.UTF-8
-Wtyczka GnuPG 2 pozwalająca komunikować się z serwerem kluczy KDNS.
-
-%package plugin-keys_ldap
-Summary:       GnuPG 2 plugin for allow talk to a LDAP keyserver
-Summary(pl.UTF-8):     Wtyczka GnuPG 2 pozwalająca komunikować się z serwerem kluczy LDAP
-Group:         Applications/File
-Requires:      %{name}-common = %{version}-%{release}
-
-%description plugin-keys_ldap
-GnuPG 2 plugin for allow talk to a LDAP keyserver.
-
-%description plugin-keys_ldap -l pl.UTF-8
-Wtyczka GnuPG 2 pozwalająca komunikować się z serwerem kluczy LDAP.
-
 %package -n gnupg-agent
 Summary:       GnuPG extension - agent
 Summary(pl.UTF-8):     Rozszerzenie GnuPG - agent
@@ -232,14 +170,13 @@ wywoływany przez gpgsm i nie używany bezpośrednio.
 %patch1 -p1
 
 %{!?with_tests:%patch2 -p1}
-%patch3 -p1
-%patch4 -p1
+#%patch3 -p1
 
 %{__rm} po/stamp-po
 
 %build
 %{__gettextize}
-%{__aclocal} -I m4 -I gl/m4
+%{__aclocal} -I m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
@@ -262,6 +199,9 @@ fi
        --with-pinentry-pgm=%{_bindir}/pinentry \
        --with-mailprog=/usr/lib/sendmail
 
+# required for info rebuild
+%{__make} -C doc defs.inc
+
 %{__make}
 
 %install
@@ -284,15 +224,14 @@ install -D %{SOURCE1} $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d/gnupg-agent.sh
 %{__rm} -r $RPM_BUILD_ROOT%{_docdir}/gnupg
 
 %find_lang gnupg2
-rm -f $RPM_BUILD_ROOT%{_datadir}/info/dir
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post  -p /sbin/postshell
+%post  common -p /sbin/postshell
 -/usr/sbin/fix-info-dir -c %{_infodir}
 
-%postun        -p /sbin/postshell
+%postun        common -p /sbin/postshell
 -/usr/sbin/fix-info-dir -c %{_infodir}
 
 %triggerpostun -n gnupg-agent -- gnupg-agent < 1.9.16-2
@@ -317,11 +256,13 @@ EOF
 
 %files common -f gnupg2.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog ChangeLog-2011 NEWS README THANKS TODO
+%doc AUTHORS ChangeLog ChangeLog-2011 NEWS README THANKS TODO doc/{DETAILS,FAQ,KEYSERVER,OpenPGP} doc/examples
+%attr(755,root,root) %{_bindir}/g13
 %attr(755,root,root) %{_bindir}/gpg-connect-agent
 %attr(755,root,root) %{_bindir}/gpgconf
-%attr(755,root,root) %{_bindir}/gpgkey2ssh
 %attr(755,root,root) %{_bindir}/gpgparsemail
+%attr(755,root,root) %{_bindir}/gpgscm
+%attr(755,root,root) %{_bindir}/gpgtar
 %attr(755,root,root) %{_bindir}/kbxutil
 %attr(755,root,root) %{_bindir}/watchgnupg
 %attr(755,root,root) %{_sbindir}/addgnupghome
@@ -335,36 +276,15 @@ EOF
 %{_mandir}/man1/gpgparsemail.1*
 %{_mandir}/man1/gpgtar.1*
 %{_mandir}/man1/watchgnupg.1*
+%{_mandir}/man7/gnupg.7*
 %{_mandir}/man8/addgnupghome.8*
 %{_mandir}/man8/applygnupgdefaults.8*
 %{_infodir}/gnupg.info*
 
-%files plugin-keys_curl
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libexecdir}/gpg2keys_curl
-
-%files plugin-keys_finger
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libexecdir}/gpg2keys_finger
-
-%files plugin-keys_hkp
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libexecdir}/gpg2keys_hkp
-
-%files plugin-keys_kdns
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libexecdir}/gpg2keys_kdns
-
-%files plugin-keys_ldap
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libexecdir}/gpg2keys_ldap
-
 %files -n gnupg-smime
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/gpgsm
-%attr(755,root,root) %{_bindir}/gpgsm-gencert.sh
 %{_mandir}/man1/gpgsm.1*
-%{_mandir}/man1/gpgsm-gencert.sh.1*
 
 %files -n gnupg-agent
 %defattr(644,root,root,755)