- up to 17.0.2

diff --git a/tint2.spec b/tint2.spec
index 354ec5f24eec7a042475d82babbc19fe65c36d11..7f913e7267d732d89ba47b48f94c74566313b5a8 100644 (file)
--- a/tint2.spec
+++ b/tint2.spec
@@ -1,39 +1,38 @@
-#
-# Conditional build:
-%bcond_without  tintwizard     # build without tintwizard
-#
 Summary:       tint2 is a simple panel/taskbar intentionally made for openbox3
 Summary(pl.UTF-8):     tint2 jest prostym panelem oryginalnie zaprojektowanym dla openbox3
 Name:          tint2
-Version:       0.11
-Release:       2
+Version:       17.0.2
+Release:       1
 License:       GPL v2
 Group:         Applications
-Source0:       http://tint2.googlecode.com/files/%{name}-%{version}.tar.bz2
-# Source0-md5: 6fc5731e7425125fa84a2add5cef4bff
-Source1:       http://tint2.googlecode.com/files/%{name}-0.7.pdf
-# Source1-md5: 25980bd22fabc6a66660173fa639957b
-URL:           http://code.google.com/p/tint2/
+Source0:       https://gitlab.com/o9000/tint2/-/archive/v17.0.2/%{name}-v%{version}.tar.bz2
+# Source0-md5: 60e5addfa33426229c00325a2e3af97b
+URL:           https://gitlab.com/o9000/tint2/
 BuildRequires: cairo-devel
 BuildRequires: cmake
 BuildRequires: desktop-file-utils
+BuildRequires: gettext-tools
 BuildRequires: glib2-devel
-BuildRequires: gtk+2-devel
-BuildRequires: imlib2-devel
+BuildRequires: gtk+3-devel
+BuildRequires: imlib2-devel >= 1.4.2
 BuildRequires: libpng-devel
+BuildRequires: librsvg-devel >= 2.14.0
 BuildRequires: libtool
 BuildRequires: pango-devel
 BuildRequires: pkgconfig
-BuildRequires: rpm-pythonprov
+BuildRequires: startup-notification-devel >= 0.12
+BuildRequires: xorg-lib-libX11-devel
 BuildRequires: xorg-lib-libXcomposite-devel
 BuildRequires: xorg-lib-libXdamage-devel
+BuildRequires: xorg-lib-libXext-devel
 BuildRequires: xorg-lib-libXinerama-devel
-BuildRequires: xorg-lib-libXrandr-devel
-%if %{with tintwizard}
-Requires:      python
-Requires:      python-pygtk-gtk
-%endif
+BuildRequires: xorg-lib-libXrandr-devel >= 1.3
+BuildRequires: xorg-lib-libXrender-devel
+Requires(post,postun): gtk-update-icon-cache
+Requires(post,postun): shared-mime-info
+Requires(post,postun): desktop-file-utils
 Suggests:      openbox
+Obsoletes:     tint2-examples < 17.0.2
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -46,60 +45,52 @@ tint2 jest prostym panelem/zasobnikiem oryginalnie zaprojektowanym dla
 openbox3, ale powinien również współpracować z innymi menadżerami
 okien. Jego kod oparty jest na ttm http://code.google.com/p/ttm/
 
-%package examples
-Summary:       tint2 - example configurations
-Summary(pl.UTF-8):     tint2 - przykładowe konfiguracje
-Group:         Documentation
-Requires:      %{name} = %{version}-%{release}
-
-%description examples
-tint2 - example configurations.
-
-%description examples -l pl.UTF-8
-tint2 - przykładowe konfiguracje.
-
 %prep
-%setup -q
+%setup -q -n %{name}-v%{version}
 mkdir build
 
 %build
 cd build
-%cmake \
-       -DCMAKE_CXX_COMPILER_WORKS=1 -DCMAKE_CXX_COMPILER="%{__cc}" \
-       -DCMAKE_INSTALL_PREFIX=%{_usr} \
-       ..
+%cmake ..
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
-%{?with_tintwizard:install -d $RPM_BUILD_ROOT%{_bindir}}
 
 %{__make} -C build install \
        DESTDIR=$RPM_BUILD_ROOT
 
-%{?with_tintwizard:cp src/tint2conf/tintwizard.py $RPM_BUILD_ROOT%{_bindir}}
-cp %{SOURCE1} doc
-install sample/*.tint2rc $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+%{__rm} -rf $RPM_BUILD_ROOT%{_docdir}
+
+%find_lang tint2conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files
+%post
+%update_desktop_database_post
+%update_icon_cache hicolor
+%update_mime_database
+
+%postun
+%update_desktop_database_postun
+%update_icon_cache hicolor
+%update_mime_database
+
+%files -f tint2conf.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog README doc/tint2-0.7.pdf
+%doc AUTHORS ChangeLog README.md doc/{tint2.md,images,manual.html,readme.html}
 %attr(755,root,root) %{_bindir}/tint2
 %attr(755,root,root) %{_bindir}/tint2conf
-%{?with_tintwizard:%attr(755,root,root) %{_bindir}/tintwizard.py}
 %dir %{_sysconfdir}/xdg/tint2
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xdg/tint2/tint2rc
 %dir %{_datadir}/tint2
 %{_datadir}/tint2/default_icon.png
 %{_mandir}/man1/tint2.1.*
-%{_pixmapsdir}/tint2conf.png
-%{_pixmapsdir}/tint2conf.svg
 %{_desktopdir}/tint2conf.desktop
+%{_desktopdir}/tint2.desktop
+%{_iconsdir}/hicolor/scalable/apps/tint2.svg
+%{_iconsdir}/hicolor/scalable/apps/tint2conf.svg
+%{_datadir}/mime/packages/tint2conf.xml
+%{_datadir}/tint2/*.tint2rc
 
-%files examples
-%defattr(644,root,root,755)
-%{_examplesdir}/%{name}-%{version}