- updated pl-update patch

- BR: libevent-devel libgomp-devel librsvg-devel
- disable BR SDL-devel (SDL support disabled in configure)

diff --git a/links2-pl-update.patch b/links2-pl-update.patch
index 2483d50eaf4ec0b1f5784b04b75d42e91f2f9cd3..2499d7bbd38f6378633bd7d481ddb565cfc77b0e 100644 (file)
--- a/links2-pl-update.patch
+++ b/links2-pl-update.patch
@@ -1,6 +1,66 @@
---- links-2.8/intl/polish.lng.orig     2013-07-22 00:58:22.000000000 +0200
-+++ links-2.8/intl/polish.lng  2013-10-12 22:00:44.326127883 +0200
-@@ -239,8 +239,8 @@
+--- links-2.10/intl/polish.lng.orig    2015-05-28 19:24:55.000000000 +0200
++++ links-2.10/intl/polish.lng 2015-07-16 21:29:26.033756135 +0200
+@@ -28,9 +28,9 @@
+ T_MEMORY, "Pamiêæ",
+ T_FILE_SIZE, "rozmiar pliku",
+ T_DEBUGGING_LEVEL, "Poziom diagnostyki",
+-T_EVENT_HANDLER, NULL,
+-T_SELECT_SYSCALL, NULL,
+-T_dISABLED, NULL,
++T_EVENT_HANDLER, "Obs³uga zdarzeñ",
++T_SELECT_SYSCALL, "Wywo³anie systemowe select",
++T_dISABLED, "wy³±czone",
+ T_IPV6, "IPv6",
+ T_NOT_ENABLED_IN_SYSTEM, "Nie w³±czone w systemie",
+ T_LOCAL_NETWORK_ONLY, "Tylko sieæ lokalna",
+@@ -41,11 +41,11 @@
+ T_XTERM_FOR_OS2, "Xterm dla OS/2",
+ T_GRAPHICS_MODE, "Tryb graficzny",
+ T_IMAGE_LIBRARIES, "Biblioteki obrazów",
+-T_OPENMP, NULL,
+-T_DISABLED, NULL,
+-T_THREAD, NULL,
+-T_THREADS, NULL,
+-T_THREADS5, NULL,
++T_OPENMP, "OpenMP",
++T_DISABLED, "Wy³±czone",
++T_THREAD, "w±tek",
++T_THREADS, "w±tki",
++T_THREADS5, "w±tków",
+ T_KEYS, "Klawiszologia",
+ T_KEYS_DESC, "ESC       poka¿ menu\n^C, q     wyj¶cie\n^P, ^N    przewiñ góra,dó³\n[, ]      przewiñ lewo,prawo\ngóra, dó³ zaznacz link\n->        wybierz link\n<-        powrót\ng         przejd¼ do URL-a\nG         przejd¼ do URL-a bazuj±cego na aktualnym\n/         szukaj\nn         znajd¼ nastêpny\nd         pobierz\n*         prze³±cz wy¶wietlanie obrazków\n^W        dope³nij URL lub szukany ³añcuch\n^B, ^X, ^V skopiuj, wytnij, wklej do/ze schowka\nAlt-1 .. Alt-9 prze³±cz ekran wirtualny (svgalib lub framebuffer)",
+ T_KEYS_BRAILLE_DESC, "a, t      kursor do linii stanu lub tytu³u\n{, }      kursor do pocz±tku/koñca linii\n^T, ^Y    nastêpny lub poprzedni odno¶nik",
+@@ -91,13 +91,13 @@
+ T_COLOR, "Kolor",
+ T_BRAILLE_TERMINAL, "Terminal Braille'a",
+ T_TERMINAL_OPTIONS, "Opcje terminala",
+-T_SCREEN_MARGINS, NULL,
+-T_LEFT_MARGIN, NULL,
+-T_RIGHT_MARGIN, NULL,
+-T_TOP_MARGIN, NULL,
+-T_BOTTOM_MARGIN, NULL,
+-T_MARGINS_TOO_LARGE, NULL,
+-T_THE_ENTERED_VALUES_ARE_TOO_LARGE_FOR_THE_CURRENT_SCREEN, NULL,
++T_SCREEN_MARGINS, "Marginesy ekranu",
++T_LEFT_MARGIN, "Lewy margines",
++T_RIGHT_MARGIN, "Prawy margines",
++T_TOP_MARGIN, "Górny margines",
++T_BOTTOM_MARGIN, "Dolny margines",
++T_MARGINS_TOO_LARGE, "Marginesy zbyt du¿e",
++T_THE_ENTERED_VALUES_ARE_TOO_LARGE_FOR_THE_CURRENT_SCREEN, "Wprowadzone warto¶ci s± zbyt du¿e dla obecnego ekranu",
+ T_NETWORK_OPTIONS, "Ustawienia sieci",
+ T_IPV6_OPTIONS, "Opcje IPv6",
+ T_IPV6_DEFAULT, "Domy¶lne preferencje systemu",
+@@ -132,7 +132,7 @@
+ T_HTML_OPTIONS, "Ustawienia HTML",
+ T_DISPLAY_TABLES, "Wy¶wietlaj tabele",
+ T_DISPLAY_FRAMES, "Wy¶wietlaj ramki",
+-T_BREAK_LONG_LINES, NULL,
++T_BREAK_LONG_LINES, "£am d³ugie linie",
+ T_DISPLAY_IMAGES, "Wy¶wietlaj obrazy",
+ T_DISPLAY_IMAGE_FILENAMES, "Wy¶wietlaj nazwy plików obrazów",
+ T_DISPLAY_LINKS_TO_IMAGES, "Pokazuj linki do obrazków",
+@@ -255,8 +255,8 @@
  T_SOCKS_UNKNOWN_ERROR, "Nieznany b³±d Socks",
  T_NO_SMB_CLIENT, "Brak zainstalowanego klienta smb (obs³ugiwane s± smbclient i smbc)",
  T_BLOCKED_URL, "Ten URL jest na li¶cie zablokowanych",
@@ -11,16 +71,18 @@
  T_NO_PROXY, "Brak proxy dla tego po³±czenia, a po³±czenia bez proxy s± wy³±czone",
  T_UNKNOWN_ERROR, "Nieznany b³±d",
  T_RECEIVED, "Pobrano",
-@@ -421,7 +421,7 @@
+@@ -437,8 +437,8 @@
  T_RETRY_ON_INTERNAL_ERRORS, "Ponawiaj próby przy wewnêtrznych b³êdach serwera (50x)",
  T_HEADER_OPTIONS, "Opcje nag³ówka",
  T_HTTP_HEADER_OPTIONS, "Opcje nag³ówka HTTP",
+-T_FAKE_FIREFOX, NULL,
 -T_DO_NOT_TRACK, NULL,
++T_FAKE_FIREFOX, "Udawanie Firefoksa (poprawia prywatno¶æ)",
 +T_DO_NOT_TRACK, "Wysy³anie ¿±dania \"do not track\"",
  T_REFERER_NONE, "Bez nag³ówka Referer",
  T_REFERER_SAME_URL, "Wysy³aj ¿±dany URL jako Referer",
  T_REFERER_FAKE, "Sta³y nag³ówek Referer",
-@@ -435,7 +435,7 @@
+@@ -452,7 +452,7 @@
  T_USE_EPRT_EPSV, "U¿ywaj poleceñ EPRT/EPSV po IPv4",
  T_USE_FAST_FTP, "U¿ywaj szybkiego FTP",
  T_SET_TYPE_OF_SERVICE, "Ustaw typ us³ugi IP (ToS)",
@@ -29,7 +91,7 @@
  T_MANUAL, "Podrêcznik u¿ytkownika",
  T_HOMEPAGE, "Strona domowa",
  T_CALIBRATION, "Kalibracja",
-@@ -523,7 +523,7 @@
+@@ -540,7 +540,7 @@
  T_SCROLL_BAR_AREA_COLOR, "Kolor obszaru paska przewijania",
  T_SCROLL_BAR_FRAME_COLOR, "Kolor ramki paska przewijania",
  T_BOOKMARKS_FILE, "Plik zak³adek",

diff --git a/links2.spec b/links2.spec
index 0fbcb7b5c73a3019fb78ccb7397c73f8d48af09c..d03541c42889292f0eab6e286dec3f324f7b8dc7 100644 (file)
--- a/links2.spec
+++ b/links2.spec
@@ -1,10 +1,10 @@
 #
 # Conditional build:
-%bcond_without graphics        # build without graphics support
-%bcond_without fb              # build without Linux Framebuffer graphics driver
-%bcond_without sdl             # build without SDL graphics driver
-%bcond_with    svga            # build without svgalib graphics driver
-%bcond_without x               # build without X Window System graphics driver
+%bcond_without graphics        # graphics support
+%bcond_without fb              # Linux Framebuffer graphics driver
+%bcond_with    sdl             # SDL graphics driver [disabled in sources]
+%bcond_with    svga            # svgalib graphics driver
+%bcond_without x               # X Window System graphics driver
 #
 Summary:       Lynx-like WWW browser
 Summary(es.UTF-8):     El links es un browser para modo texto, similar a lynx
@@ -39,6 +39,7 @@ BuildRequires:        autoconf >= 2.59-9
 BuildRequires: automake
 BuildRequires: bzip2-devel
 BuildRequires: gpm-devel
+BuildRequires: libevent-devel
 BuildRequires: ncurses-devel >= 5.1
 BuildRequires: openssl-devel >= 0.9.7d
 BuildRequires: pkgconfig
@@ -46,8 +47,10 @@ BuildRequires:       zlib-devel
 %if %{with graphics}
 %{?with_fb:BuildRequires:      DirectFB-devel >= 0.9.17}
 %{?with_sdl:BuildRequires:     SDL-devel >= 1.2.0}
+BuildRequires: libgomp-devel
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
+BuildRequires: librsvg-devel >= 2.0.0
 BuildRequires: libtiff-devel
 %{?with_svga:BuildRequires:    svgalib-devel}
 %{?with_x:BuildRequires:       xorg-lib-libX11-devel}
@@ -114,7 +117,7 @@ Links - це текстовий WWW броузер, на перший погля
 %patch5 -p1
 %patch6 -p1
 %patch9 -p1
-#%%patch10 -p1
+%patch10 -p1
 %patch17 -p1
 %patch18 -p1