- up to 0.11

- it now uses cmake build, BR: cmake
- drop auto-hell
- BR: desktop-file-utils
- mo' files!
- back to .1 rel. for testing purposes

Changed files:
    tint2.spec -> 1.15

diff --git a/tint2.spec b/tint2.spec
index 6287e61412bd66bf18e41c3d948331a369e39d41..205c2eb309621ce5b62c22d10ad443bb1783edcf 100644 (file)
--- a/tint2.spec
+++ b/tint2.spec
@@ -5,19 +5,18 @@
 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.9
-Release:       1
+Version:       0.11
+Release:       0.1
 License:       GPL v2
 Group:         Applications
-Source0:       http://tint2.googlecode.com/files/%{name}-%{version}.tar.gz
-# Source0-md5: 411de6ccb8b82089852d8c854b12ddb9
+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
-Patch0:                %{name}-tintwizard_conf.patch
 URL:           http://code.google.com/p/tint2/
-BuildRequires: autoconf
-BuildRequires: automake
 BuildRequires: cairo-devel
+BuildRequires: cmake
+BuildRequires: desktop-file-utils
 BuildRequires: glib2-devel
 BuildRequires: imlib2-devel
 BuildRequires: libpng-devel
@@ -59,15 +58,13 @@ tint2 - przykładowe konfiguracje.
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1
+mkdir build
 
 %build
-%{__libtoolize}
-%{__aclocal}
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure
+cd build
+%cmake \
+       -DCMAKE_INSTALL_PREFIX=%{_usr} \
+       ..
 %{__make} \
        CC="%{__cc}" \
        CFLAGS="%{rpmcflags} %{rpmldflags}"
@@ -77,7 +74,7 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 %{?with_tintwizard:install -d $RPM_BUILD_ROOT%{_bindir}}
 
-%{__make} install \
+%{__make} -C build install \
        DESTDIR=$RPM_BUILD_ROOT
 
 %{?with_tintwizard:cp src/tint2conf/tintwizard.py $RPM_BUILD_ROOT%{_bindir}}
@@ -89,14 +86,18 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README doc/tint2-0.7.pdf
+%doc AUTHORS ChangeLog README doc/tint2-0.7.pdf
 %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
 
 %files examples
 %defattr(644,root,root,755)