packages: dynagen/dynagen-debian.patch, dynagen/dynagen.spec - removal unne...

[jasw]

Author: jasw                         Date: Wed Apr  7 16:46:22 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- removal unnecessary %exlude - removed in the patch 
- adding to the patch the path to config file
- tidying up after oneself 
- rel 3.

---- Files affected:
packages/dynagen:
   dynagen-debian.patch (1.2 -> 1.3) , dynagen.spec (1.8 -> 1.9) 

---- Diffs:

================================================================
Index: packages/dynagen/dynagen-debian.patch
diff -u packages/dynagen/dynagen-debian.patch:1.2 packages/dynagen/dynagen-debian.patch:1.3
--- packages/dynagen/dynagen-debian.patch:1.2	Tue Apr  6 12:09:15 2010
+++ packages/dynagen/dynagen-debian.patch	Wed Apr  7 18:46:16 2010
@@ -314,7 +314,19 @@
 +    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,

================================================================
Index: packages/dynagen/dynagen.spec
diff -u packages/dynagen/dynagen.spec:1.8 packages/dynagen/dynagen.spec:1.9
--- packages/dynagen/dynagen.spec:1.8	Tue Apr  6 12:09:15 2010
+++ packages/dynagen/dynagen.spec	Wed Apr  7 18:46:16 2010
@@ -3,7 +3,7 @@
 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
@@ -72,12 +72,12 @@
 %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*
 
@@ -87,6 +87,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2010/04/07 16:46:16  jasw
+- removal unnecessary %exlude - removed in the patch
+- adding to the patch the path to config file
+- tidying up after oneself
+- rel 3.
+
 Revision 1.8  2010/04/06 10:09:15  jasw
 + add missing pymodules confConsole, pemu_lib
 + remove redundant pymodules
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dynagen/dynagen-debian.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dynagen/dynagen.spec?r1=1.8&r2=1.9&f=u