+ add missing pymodules confConsole, pemu_lib

+ remove redundant pymodules
+ rel 2

Changed files:
    dynagen-debian.patch -> 1.2
    dynagen.spec -> 1.8

diff --git a/dynagen-debian.patch b/dynagen-debian.patch
index 8b44068ff50dd39c1f99e210ba959419bec6f590..ff1a2627716ec7d7c963267d17cc2fd53a067f63 100644 (file)
--- a/dynagen-debian.patch
+++ b/dynagen-debian.patch
@@ -314,7 +314,7 @@ 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', ['dynagen.ini']), ('/usr/share/man/man1', ['debian/dynagen.1']) ],
-+    py_modules = [ 'configobj', 'console', 'dynamips_lib', 'validate' ]
++    data_files = [ ('/etc/', ['dynagen.ini']), ('/usr/share/man/man1', ['debian/dynagen.1']) ],
++    py_modules = [ 'confConsole', 'console', 'dynamips_lib', 'pemu_lib' ]
 +)
 +

diff --git a/dynagen.spec b/dynagen.spec
index 5ec7f00b833fad66442caa4a02610c0b816becf2..094340e9cf82786336503abae1d82796a0b263a1 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:       1
+Release:       2
 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/dynagen.ini
+#%dir %{_sysconfdir}/dynagen
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/dynagen.ini
 %attr(755,root,root) %{_bindir}/dynagen
 %{py_sitescriptdir}/*.py[co]
-%exclude %{py_sitescriptdir}/configobj.py[co]
-%exclude %{py_sitescriptdir}/validate.py[co]
+#%exclude %{py_sitescriptdir}/configobj.py[co]
+#%exclude %{py_sitescriptdir}/validate.py[co]
 %{py_sitescriptdir}/dynagen-*.egg-info
 %{_mandir}/man1/dynagen.1*