- removal unnecessary %exlude - removed in the patch

- adding to the patch the path to config file
- tidying up after oneself
- rel 3.

Changed files:
    dynagen-debian.patch -> 1.3
    dynagen.spec -> 1.9

diff --git a/dynagen-debian.patch b/dynagen-debian.patch
index ff1a2627716ec7d7c963267d17cc2fd53a067f63..1f976ecc01606426f8263e243530cfe84a326b0c 100644 (file)
--- a/dynagen-debian.patch
+++ b/dynagen-debian.patch
@@ -314,7 +314,19 @@ diff -urNad dynagen-0.8.3~/setup.py dynagen-0.8.3/setup.py
 +    url = "http://sourceforge.net/projects/dyna-gen",
 +
 +    scripts = [ 'dynagen' ],
-+    data_files = [ ('/etc/', ['dynagen.ini']), ('/usr/share/man/man1', ['debian/dynagen.1']) ],
++    data_files = [ ('/etc/dynagen', ['dynagen.ini']), ('/usr/share/man/man1', ['debian/dynagen.1']), 
++      ('/usr/share/dynagen/', ['configspec']) ],
 +    py_modules = [ 'confConsole', 'console', 'dynamips_lib', 'pemu_lib' ]
 +)
 +
+--- dynagen-0.11.0/dynagen_orig        2010-04-07 18:19:38.000000000 +0200
++++ dynagen-0.11.0/dynagen     2010-04-07 18:20:05.000000000 +0200
+@@ -43,7 +43,7 @@
+ VERSION = '0.11.0'
+ CONFIGSPECPATH = ['/usr/share/dynagen', '/usr/local/share']
+ CONFIGSPEC = 'configspec'
+-INIPATH = ['/etc', '/usr/local/etc']
++INIPATH = ['/etc', '/usr/local/etc', '/etc/dynagen']
+ INIFILE = 'dynagen.ini'
+ MODELTUPLE = (  # A tuple of known model objects
+     C1700,

diff --git a/dynagen.spec b/dynagen.spec
index 094340e9cf82786336503abae1d82796a0b263a1..bd2007cbb76a952d99cc83c5414dd19f85cd982e 100644 (file)
--- a/dynagen.spec
+++ b/dynagen.spec
@@ -2,7 +2,7 @@ Summary:        Cisco router emulator controller
 Summary(pl.UTF-8):     Kontroler emulatora routera Cisco
 Name:          dynagen
 Version:       0.11.0
-Release:       2
+Release:       3
 License:       GPL v2+
 Group:         Networking/Utilities
 Source0:       http://dl.sourceforge.net/dyna-gen/%{name}-%{version}.tar.gz
@@ -71,11 +71,11 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc README.txt docs sample_labs
-#%dir %{_sysconfdir}/dynagen
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/dynagen.ini
+%dir %{_sysconfdir}/dynagen
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/dynagen/dynagen.ini
+%dir %{_datadir}/dynagen
+%{_datadir}/dynagen/configspec
 %attr(755,root,root) %{_bindir}/dynagen
 %{py_sitescriptdir}/*.py[co]
-#%exclude %{py_sitescriptdir}/configobj.py[co]
-#%exclude %{py_sitescriptdir}/validate.py[co]
 %{py_sitescriptdir}/dynagen-*.egg-info
 %{_mandir}/man1/dynagen.1*