Merge branch 'f18'

Conflicts: libupnp.spec
12 years ago · bfbc8f1db4
parent 68ef8a6779 fbf281dd34
commit bfbc8f1db4
3 changed files with 5 additions and 4 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,3 +1,4 @@
 libupnp-1.6.6.tar.bz2
 /libupnp-1.6.13.tar.bz2
 /libupnp-1.6.17.tar.bz2
+/libupnp-1.6.18.tar.bz2
--- a/libupnp.spec
+++ b/libupnp.spec
@ -1,4 +1,4 @@
-Version: 1.6.17
+Version: 1.6.18
 Summary: Universal Plug and Play (UPnP) SDK
 Name: libupnp
 Release: 2%{?dist}
@ -74,8 +74,8 @@ make install DESTDIR=$RPM_BUILD_ROOT
 rm -rf %{buildroot}

 %changelog
-* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6.17-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+* Tue Jan 29 2013 Adam Jackson <ajax@redhat.com> 1.6.18-1
+- libupnp 1.6.18 (#905577)

 * Tue Oct 16 2012 Adam Jackson <ajax@redhat.com> 1.6.17-1
 - libupnp 1.6.17
--- a/2
+++ b/2
@ -1 +1 @@
-efbf0d470ce7157bc0e6ca836e246de5  libupnp-1.6.17.tar.bz2
+11c6484fd2e2927bf3b8d8108407ca56  libupnp-1.6.18.tar.bz2