[libmowgli/f13/master: 5/5] Merge branch 'master' into f13

[Michael Schwendt]

commit b139a9c5b514145eb6247b2608c7413447ee16b7
Merge: 9fe3e2a 9c02c38
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Wed Jan 5 10:35:25 2011 +0100

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore
    	libmowgli.spec

 .gitignore                          |    2 +-
 libmowgli-0.7.0-20100604.patch      |  145 -----------------------------------
 libmowgli-0.7.1-list-offbyone.patch |   12 +++
 libmowgli.spec                      |   18 +++-
 sources                             |    2 +-
 5 files changed, 27 insertions(+), 152 deletions(-)
---
diff --cc .gitignore
index d3e5eed,3d07236..8a9dd9c
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--libmowgli-0.7.0.tgz
+ libmowgli-0.7.1.tgz
diff --cc libmowgli.spec
index bb8be1e,bd5a86b..bef8ba5
--- a/libmowgli.spec
+++ b/libmowgli.spec
@@@ -9,13 -9,14 +9,15 @@@ Group:          System Environment/Libr
  # https://fedoraproject.org/wiki/Licensing/MIT
  License:        MIT
  
- # 404 not found - http://atheme.org/projects/mowgli.shtml
- URL:            http://atheme.org
+ URL:            http://www.atheme.org/project/mowgli
  
  Source0:        http://distfiles.atheme.org/libmowgli-%{version}.tgz
 +Patch0:         libmowgli-0.7.0-20100604.patch
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
+ # fixed upstream
+ Patch0: libmowgli-0.7.1-list-offbyone.patch
+ 
  %description
  libmowgli is a development framework for C (like GLib), which provides high
  performance and highly flexible algorithms. It can be used as a suppliment to