rpms/libupnp/FC-3 .cvsignore, 1.2, 1.3 libupnp.spec, 1.1, 1.2 sources, 1.2, 1.3 libupnp_dsm_320.patch, 1.1, NONE libupnp_ixml_FC4.patch, 1.1, NONE libupnp_performance.patch, 1.1, NONE
Eric Tanguy (tanguy)
fedora-extras-commits at redhat.com
Mon Mar 6 17:03:21 UTC 2006
- Previous message (by thread): rpms/libupnp import.log,1.5,1.6
- Next message (by thread): rpms/viruskiller/devel viruskiller-1.0-makefile.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 viruskiller.spec, 1.8, 1.9 viruskiller-0.9-makefile.patch, 1.1, NONE viruskiller-0.9-zzip.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: tanguy
Update of /cvs/extras/rpms/libupnp/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv348/FC-3
Modified Files:
.cvsignore libupnp.spec sources
Removed Files:
libupnp_dsm_320.patch libupnp_ixml_FC4.patch
libupnp_performance.patch
Log Message:
auto-import libupnp-1.3.1-1 on branch FC-3 from libupnp-1.3.1-1.src.rpm
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libupnp/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 20 Jan 2006 08:40:11 -0000 1.2
+++ .cvsignore 6 Mar 2006 17:03:20 -0000 1.3
@@ -1 +1 @@
-libupnp-1.2.1a.tar.gz
+libupnp-1.3.1.tar.gz
Index: libupnp.spec
===================================================================
RCS file: /cvs/extras/rpms/libupnp/FC-3/libupnp.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libupnp.spec 20 Jan 2006 08:40:11 -0000 1.1
+++ libupnp.spec 6 Mar 2006 17:03:20 -0000 1.2
@@ -1,14 +1,11 @@
-Version: 1.2.1a
+Version: 1.3.1
Summary: Universal Plug and Play (UPnP) SDK
Name: libupnp
-Release: 4%{?dist}
+Release: 1%{?dist}
License: BSD
Group: System Environment/Libraries
URL: http://upnp.sourceforge.net/
Source: http://ovh.dl.sourceforge.net/sourceforge/upnp/%{name}-%{version}.tar.gz
-Patch0: libupnp_dsm_320.patch
-Patch1: libupnp_ixml_FC4.patch
-Patch2: libupnp_performance.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%description
@@ -28,61 +25,52 @@
%prep
%setup -q
-%patch0 -p0
-%patch1 -p0
-%patch2 -p1
chmod 644 {LICENSE,README}
-# Fix permissions for files in debuginfo package
-find . -name '*.[ch]' | xargs chmod 644
-
-# Fix libupnp.so symlink
-sed -i -e 's#ln -s \$(PREFIX)/usr/lib/libupnp\.so#ln -s libupnp.so#' upnp/makefile
-
-# Remove -Os optflag and add RPM optflags in makefiles
-# Install libraries in correct directories
-find . -name '[Mm]akefile' | xargs sed -i \
- -e 's/^\([[:space:]]*CFLAGS .*\) -Os/\1/' \
- -e 's/^\([[:space:]]*DEBUG_FLAGS .*\) -Os/\1/' \
- -e 's/^[[:space:]]*CFLAGS .*/& $(RPM_OPT_FLAGS)/' \
- -e 's#/usr/lib\([/ ;]\)#%{_libdir}\1#g' \
- -e 's#/usr/lib$#%{_libdir}#g'
-
%build
-make -C upnp STRIP="echo Not stripping" %{?_smp_mflags}
+%configure
+make %{?_smp_mflags}
%install
rm -rf %{buildroot}
+%makeinstall
-## Install libupnp.so and headers
-make -C upnp PREFIX=%{buildroot} install
-
-## Install libixml.so and headers
-make -C ixml PREFIX=%{buildroot} install
-install -p ixml/inc/ixml.h %{buildroot}%{_includedir}/upnp
-
-## Install libthreadutil.so and headers
-make -C threadutil PREFIX=%{buildroot} install
-
+rm %{buildroot}%{_libdir}/{libixml.la,libthreadutil.la,libupnp.la}
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
-%doc LICENSE README
-%{_libdir}/libixml.so*
-%{_libdir}/libthreadutil.so*
-%{_libdir}/libupnp.so*
+%doc LICENSE README NEWS
+%{_libdir}/libixml.so.*
+%{_libdir}/libthreadutil.so.*
+%{_libdir}/libupnp.so.*
%files devel
%defattr(0644,root,root,0755)
%{_includedir}/upnp/
+%{_libdir}/libixml.so
+%{_libdir}/libthreadutil.so
+%{_libdir}/libupnp.so
+%{_libdir}/libixml.a
+%{_libdir}/libthreadutil.a
+%{_libdir}/libupnp.a
+%{_libdir}/pkgconfig/libupnp.pc
%clean
rm -rf %{buildroot}
%changelog
+* Sun Mar 05 2006 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 1.3.1-1
+- Update to 1.3.1
+
+* Tue Feb 14 2006 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 1.2.1a-6
+- Rebuild for FC5
+
+* Fri Feb 10 2006 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 1.2.1a-5
+- Rebuild for FC5
+
* Mon Jan 9 2006 Eric Tanguy 1.2.1a-4
- Include libupnp.so symlink in package to take care of non versioning of libupnp.so.1.2.1
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libupnp/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 20 Jan 2006 08:40:11 -0000 1.2
+++ sources 6 Mar 2006 17:03:21 -0000 1.3
@@ -1 +1 @@
-e72b3550bf064eedf080f16f09688891 libupnp-1.2.1a.tar.gz
+6646be5e31e58188e8f47c6ce64faa4c libupnp-1.3.1.tar.gz
--- libupnp_dsm_320.patch DELETED ---
--- libupnp_ixml_FC4.patch DELETED ---
--- libupnp_performance.patch DELETED ---
- Previous message (by thread): rpms/libupnp import.log,1.5,1.6
- Next message (by thread): rpms/viruskiller/devel viruskiller-1.0-makefile.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 viruskiller.spec, 1.8, 1.9 viruskiller-0.9-makefile.patch, 1.1, NONE viruskiller-0.9-zzip.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list