- updated to 3.18.1

diff --git a/gnote.spec b/gnote.spec
index e0547fd48f34f2593804dc6d5d62be52392399ad..b44cf822eadf6ec8763c9868d729347f267e96bb 100644 (file)
--- a/gnote.spec
+++ b/gnote.spec
@@ -1,13 +1,14 @@
 # TODO: build version without x11 support (plain GTK+) to use on Wayland or Broadway
 #
 Summary:       Note-taking application
+Summary(pl.UTF-8):     Aplikacja do zbierania notatek
 Name:          gnote
-Version:       3.10.3
-Release:       3
-License:       GPL v3
+Version:       3.18.1
+Release:       1
+License:       GPL v3+
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/gnote/3.10/%{name}-%{version}.tar.xz
-# Source0-md5: d0f9e0a5f4c9143d16a5c283c63e7330
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/gnote/3.18/%{name}-%{version}.tar.xz
+# Source0-md5: cc985a9ab0614ee2ed831a57cf260231
 URL:           http://live.gnome.org/Gnote
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake >= 1.11
@@ -17,29 +18,32 @@ BuildRequires:      docbook-dtd412-xml
 BuildRequires: gettext-tools
 BuildRequires: glibmm-devel >= 2.32
 BuildRequires: gnome-doc-utils
-BuildRequires: gtk+3-devel >= 3.6.0
-BuildRequires: gtkmm3-devel >= 3.6.0
+BuildRequires: gtk+3-devel >= 3.10
+BuildRequires: gtkmm3-devel >= 3.10
 BuildRequires: gtkspell3-devel >= 3.0.0
 BuildRequires: intltool >= 0.35.0
-BuildRequires: itstool
 BuildRequires: libsecret-devel >= 0.8
 BuildRequires: libstdc++-devel
-BuildRequires: libtool
+BuildRequires: libtool >= 2:2
 BuildRequires: libuuid-devel
-BuildRequires: libxml2-devel
+BuildRequires: libxml2-devel >= 2.0
 BuildRequires: libxslt-devel
-BuildRequires: pcre-cxx-devel
 BuildRequires: pkgconfig
 BuildRequires: rpmbuild(find_lang) >= 1.23
 BuildRequires: rpmbuild(macros) >= 1.592
 BuildRequires: tar >= 1:1.22
+BuildRequires: xorg-lib-libX11-devel
 BuildRequires: xz
-BuildRequires: yelp-devel
+BuildRequires: yelp-tools
 Requires(post,postun): /sbin/ldconfig
 Requires(post,postun): glib2 >= 1:2.32.0
 Requires(post,postun): gtk-update-icon-cache
 Requires(post,postun): hicolor-icon-theme
+Requires:      glibmm >= 2.32
+Requires:      gtk+3 >= 3.10
+Requires:      gtkmm3 >= 3.10
 Requires:      hicolor-icon-theme
+Requires:      libsecret >= 0.8
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -48,26 +52,33 @@ use. It lets you organize your notes intelligently by allowing you to
 easily link ideas together with Wiki style interconnects. It is a port
 of Tomboy to C++ and consumes fewer resources.
 
+%description -l pl.UTF-8
+Gnote to graficzna aplikacja do zbierania notatek. Jest prosta i łatwa
+w użyciu; umożliwia organizowanie notatek w sposób inteligentny,
+pozwalając łatwo łączyć pomysły przy użyciu połączeń w stylu Wiki.
+Jest to port aplikacji Tomboy do C++, pochłaniający mniej zasobów.
+
 %prep
 %setup -q
 
 %build
 %configure \
+       --disable-silent-rules \
        --with-x11-support
-%{__make} V=1
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} V=1 install \
+%{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/gnote/addins/*/*.la
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/gnote/addins/%{version}/*.la
 
 # remove -devel files
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libgnote.{la,so}
 
-%find_lang gnote --with-gnome --with-omf
+%find_lang gnote --with-gnome
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -86,53 +97,57 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README TODO
 %attr(755,root,root) %{_bindir}/gnote
-%attr(755,root,root) %{_libdir}/libgnote-3.10.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgnote-3.10.so.1
+%attr(755,root,root) %{_libdir}/libgnote-3.18.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgnote-3.18.so.0
 %dir %{_libdir}/gnote
 %dir %{_libdir}/gnote/addins
 %dir %{_libdir}/gnote/addins/%{version}
-%attr(755,root,root) %{_libdir}/gnote/addins/*/backlinks.so
-%attr(755,root,root) %{_libdir}/gnote/addins/*/bugzilla.so
-%attr(755,root,root) %{_libdir}/gnote/addins/*/exporttohtml.so
-%attr(755,root,root) %{_libdir}/gnote/addins/*/filesystemsyncservice.so
-%attr(755,root,root) %{_libdir}/gnote/addins/*/fixedwidth.so
-%attr(755,root,root) %{_libdir}/gnote/addins/*/inserttimestamp.so
-%attr(755,root,root) %{_libdir}/gnote/addins/*/notedirectorywatcher.so
-%attr(755,root,root) %{_libdir}/gnote/addins/*/noteoftheday.so
-%attr(755,root,root) %{_libdir}/gnote/addins/*/printnotes.so
-%attr(755,root,root) %{_libdir}/gnote/addins/*/readonly.so
-%attr(755,root,root) %{_libdir}/gnote/addins/*/replacetitle.so
-%attr(755,root,root) %{_libdir}/gnote/addins/*/specialnotes.so
-%attr(755,root,root) %{_libdir}/gnote/addins/*/statistics.so
-%attr(755,root,root) %{_libdir}/gnote/addins/*/stickynoteimport.so
-%attr(755,root,root) %{_libdir}/gnote/addins/*/tableofcontents.so
-%attr(755,root,root) %{_libdir}/gnote/addins/*/tomboyimport.so
-%attr(755,root,root) %{_libdir}/gnote/addins/*/underline.so
-%attr(755,root,root) %{_libdir}/gnote/addins/*/webdavsyncservice.so
-%{_libdir}/gnote/addins/*/backlinks.desktop
-%{_libdir}/gnote/addins/*/bugzilla.desktop
-%{_libdir}/gnote/addins/*/exporttohtml.desktop
-%{_libdir}/gnote/addins/*/filesystemsyncservice.desktop
-%{_libdir}/gnote/addins/*/fixedwidth.desktop
-%{_libdir}/gnote/addins/*/inserttimestamp.desktop
-%{_libdir}/gnote/addins/*/notedirectorywatcher.desktop
-%{_libdir}/gnote/addins/*/noteoftheday.desktop
-%{_libdir}/gnote/addins/*/printnotes.desktop
-%{_libdir}/gnote/addins/*/readonly.desktop
-%{_libdir}/gnote/addins/*/replacetitle.desktop
-%{_libdir}/gnote/addins/*/specialnotes.desktop
-%{_libdir}/gnote/addins/*/statistics.desktop
-%{_libdir}/gnote/addins/*/stickynoteimport.desktop
-%{_libdir}/gnote/addins/*/tableofcontents.desktop
-%{_libdir}/gnote/addins/*/tomboyimport.desktop
-%{_libdir}/gnote/addins/*/underline.desktop
-%{_libdir}/gnote/addins/*/webdavsyncservice.desktop
+%attr(755,root,root) %{_libdir}/gnote/addins/%{version}/backlinks.so
+%attr(755,root,root) %{_libdir}/gnote/addins/%{version}/bugzilla.so
+%attr(755,root,root) %{_libdir}/gnote/addins/%{version}/exporttogtg.so
+%attr(755,root,root) %{_libdir}/gnote/addins/%{version}/exporttohtml.so
+%attr(755,root,root) %{_libdir}/gnote/addins/%{version}/filesystemsyncservice.so
+%attr(755,root,root) %{_libdir}/gnote/addins/%{version}/fixedwidth.so
+%attr(755,root,root) %{_libdir}/gnote/addins/%{version}/inserttimestamp.so
+%attr(755,root,root) %{_libdir}/gnote/addins/%{version}/notedirectorywatcher.so
+%attr(755,root,root) %{_libdir}/gnote/addins/%{version}/noteoftheday.so
+%attr(755,root,root) %{_libdir}/gnote/addins/%{version}/printnotes.so
+%attr(755,root,root) %{_libdir}/gnote/addins/%{version}/readonly.so
+%attr(755,root,root) %{_libdir}/gnote/addins/%{version}/replacetitle.so
+%attr(755,root,root) %{_libdir}/gnote/addins/%{version}/specialnotes.so
+%attr(755,root,root) %{_libdir}/gnote/addins/%{version}/statistics.so
+%attr(755,root,root) %{_libdir}/gnote/addins/%{version}/stickynoteimport.so
+%attr(755,root,root) %{_libdir}/gnote/addins/%{version}/tableofcontents.so
+%attr(755,root,root) %{_libdir}/gnote/addins/%{version}/todo.so
+%attr(755,root,root) %{_libdir}/gnote/addins/%{version}/tomboyimport.so
+%attr(755,root,root) %{_libdir}/gnote/addins/%{version}/underline.so
+%attr(755,root,root) %{_libdir}/gnote/addins/%{version}/webdavsyncservice.so
+%{_libdir}/gnote/addins/%{version}/backlinks.desktop
+%{_libdir}/gnote/addins/%{version}/bugzilla.desktop
+%{_libdir}/gnote/addins/%{version}/exporttogtg.desktop
+%{_libdir}/gnote/addins/%{version}/exporttohtml.desktop
+%{_libdir}/gnote/addins/%{version}/filesystemsyncservice.desktop
+%{_libdir}/gnote/addins/%{version}/fixedwidth.desktop
+%{_libdir}/gnote/addins/%{version}/inserttimestamp.desktop
+%{_libdir}/gnote/addins/%{version}/notedirectorywatcher.desktop
+%{_libdir}/gnote/addins/%{version}/noteoftheday.desktop
+%{_libdir}/gnote/addins/%{version}/printnotes.desktop
+%{_libdir}/gnote/addins/%{version}/readonly.desktop
+%{_libdir}/gnote/addins/%{version}/replacetitle.desktop
+%{_libdir}/gnote/addins/%{version}/specialnotes.desktop
+%{_libdir}/gnote/addins/%{version}/statistics.desktop
+%{_libdir}/gnote/addins/%{version}/stickynoteimport.desktop
+%{_libdir}/gnote/addins/%{version}/tableofcontents.desktop
+%{_libdir}/gnote/addins/%{version}/todo.desktop
+%{_libdir}/gnote/addins/%{version}/tomboyimport.desktop
+%{_libdir}/gnote/addins/%{version}/underline.desktop
+%{_libdir}/gnote/addins/%{version}/webdavsyncservice.desktop
+%{_datadir}/appdata/gnote.appdata.xml
 %{_datadir}/dbus-1/services/org.gnome.Gnote.service
 %{_datadir}/glib-2.0/schemas/org.gnome.gnote.gschema.xml
+%{_datadir}/gnome-shell/search-providers/gnote-search-provider.ini
 %{_datadir}/gnote
 %{_desktopdir}/gnote.desktop
-%{_iconsdir}/hicolor/*/*/*.png
-%{_iconsdir}/hicolor/*/*/*.svg
+%{_iconsdir}/hicolor/*x*/apps/gnote.png
+%{_iconsdir}/hicolor/scalable/apps/gnote.svg
 %{_mandir}/man1/gnote.1*
-%{_datadir}/appdata/gnote.appdata.xml
-%{_datadir}/gnome-shell/search-providers/gnote-search-provider.ini