- ver. 1.7.2

- removed config dir patch; there are multiple configuration files
  distributed, so /etc/conky/ directory makes sense

Changed files:
    conky-configdir.patch -> 1.3
    conky.spec -> 1.29

diff --git a/conky-configdir.patch b/conky-configdir.patch
deleted file mode 100644 (file)
index 6e85744..0000000
--- a/conky-configdir.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- conky-1.6.1/src/Makefile.am        2008-08-12 22:49:11.000000000 +0200
-+++ conky-1.6.1/src/Makefile.am-new    2008-09-21 11:06:13.714222266 +0200
-@@ -24,7 +24,7 @@
- #
- # $Id$
- 
--INCLUDES = -DSYSTEM_CONFIG_FILE=\"$(sysconfdir)/conky/conky.conf\"
-+INCLUDES = -DSYSTEM_CONFIG_FILE=\"$(sysconfdir)/conky.conf\"
- 
- bin_PROGRAMS = conky
- 
---- conky-1.6.1/data/Makefile.am       2007-11-27 23:31:13.000000000 +0100
-+++ conky-1.6.1/data/Makefile.am-new   2008-09-21 11:11:46.257955236 +0200
-@@ -24,7 +24,7 @@
- #
- # $Id$
- 
--configdir = ${sysconfdir}/conky
-+configdir = ${sysconfdir}
- dist_config_DATA = conky.conf
- 
- # vi:set ts=8 sw=8 noet ai nocindent syntax=automake:

diff --git a/conky.spec b/conky.spec
index 94034e1cf37ce9a1879b0d033fbaca12aa06e04b..9e9251a8829d52d25a77be32488ffc806173939d 100644 (file)
--- a/conky.spec
+++ b/conky.spec
@@ -1,13 +1,12 @@
 Summary:       A light-weight system monitor
 Summary(pl.UTF-8):     Monitor systemu dla środowiska graficznego
 Name:          conky
-Version:       1.7.1.1
+Version:       1.7.2
 Release:       1
 License:       Distributable (see COPYING doc)
 Group:         X11/Applications
 Source0:       http://dl.sourceforge.net/conky/%{name}-%{version}.tar.bz2
-# Source0-md5: 153a661e78a466c95b1b332e7cd599cb
-Patch0:                %{name}-configdir.patch
+# Source0-md5: cf6f5d45d42ad68c618c00271813b80d
 URL:           http://conky.sourceforge.net/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -39,7 +38,6 @@ Może wyświetlać takie informacje, jak:
 
 %prep
 %setup -q
-%patch0 -p1
 %{__sed} -i 's,lua5.1,lua51,' configure.ac
 
 %build
@@ -62,8 +60,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.conf
 # COPYING must be added (see COPYING file)
 %doc AUTHORS ChangeLog COPYING README TODO
+%dir %{_sysconfdir}/conky/*.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conky/%{name}.conf
 %attr(755,root,root) %{_bindir}/*
 %{_mandir}/man1/%{name}.1*