[Olsr-cvs] olsrd-current/redhat olsrd.spec,1.1,1.2

[Bernd Petrovitsch]

Update of /cvsroot/olsrd/olsrd-current/redhat
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv363/redhat

Modified Files:
	olsrd.spec 
Log Message:
* update with .spec file from the 0.5.2-*.src.rpm and killed the lines for the patch

Index: olsrd.spec
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/redhat/olsrd.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** olsrd.spec	5 Feb 2007 21:09:57 -0000	1.1
--- olsrd.spec	2 Aug 2007 20:31:37 -0000	1.2
***************
*** 6,10 ****
  Packager:  (spam-protected)
  Group:     System Environment/Daemons
! Source:    http://www.olsr.org/releases/0.4/olsrd-%{version}.tar.bz2
  URL:       http://www.olsr.org/
  BuildRoot: %{_tmppath}/%{name}-root
--- 6,10 ----
  Packager:  (spam-protected)
  Group:     System Environment/Daemons
! Source:    http://www.olsr.org/releases/0.5/olsrd-%{version}.tar.bz2
  URL:       http://www.olsr.org/
  BuildRoot: %{_tmppath}/%{name}-root
***************
*** 19,23 ****
  
  %prep
! %setup 
  
  %{__cat} << 'EOF' > %{name}.init
--- 19,24 ----
  
  %prep
! %setup
! 
  
  %{__cat} << 'EOF' > %{name}.init
***************
*** 109,119 ****
  make %{?_smp_mflags}
  make %{?_smp_mflags} libs
- #cd lib/dyn_gw && make %{?_smp_mflags} OS=linux
- #cd ../dot_draw && make %{?_smp_mflags} OS=linux
- #cd ../httpinfo && make %{?_smp_mflags} OS=linux
- #cd ../nameservice && make %{?_smp_mflags} OS=linux
- #cd ../powerinfo && make %{?_smp_mflags} OS=linux
- #cd ../secure && make %{?_smp_mflags} OS=linux
- #cd ../..
  
  %install
--- 110,113 ----
***************
*** 145,152 ****
  %defattr(-, root, root, 0755)
  %doc README CHANGELOG
! %doc lib/dyn_gw/README_DYN_GW lib/dot_draw/README_DOT_DRAW lib/httpinfo/README_HTTPINFO
! %doc lib/secure/SOLSR-README lib/pgraph/README-OLSR
! # Do not overwrite original README, should rename these files
! #%doc lib/nameservice/README lib/mini/README
  %config(noreplace) %{_sysconfdir}/olsrd.conf
  %config %{_initrddir}/olsrd
--- 139,144 ----
  %defattr(-, root, root, 0755)
  %doc README CHANGELOG
! %doc lib/*/*README*
! 
  %config(noreplace) %{_sysconfdir}/olsrd.conf
  %config %{_initrddir}/olsrd
***************
*** 158,165 ****
  
  %changelog
! * Mon Feb  5 2007 Bernd Petrovitsch <(spam-protected)>
! - updated to CVS-HEAD:
! - s/INSTALL_PREFIX/DESTDIR/
! - removed references to the powerinfo plugin since it is gone
  
  * Wed Jan 04 2006 Roar Bjørgum Rotvik <(spam-protected)>
--- 150,162 ----
  
  %changelog
! * Tue Jul 17 2007 Roar Bjørgum Rotvik <(spam-protected)>
! - Created spec-file for 0.5.2
! 
! * Mon Jul 09 2007 Roar Bjørgum Rotvik <(spam-protected)>
! - Created spec-file for 0.5.1
! 
! * Tue Apr 03 2007 Roar Bjørgum Rotvik <(spam-protected)>
! - Created spec-file for 0.5.0
! - Changed from INSTALL_PREFIX to DESTDIR
  
  * Wed Jan 04 2006 Roar Bjørgum Rotvik <(spam-protected)>