Hello community,
here is the log from the commit of package libnut
checked in at Mon Apr 28 17:54:43 CEST 2008.
--------
--- libnut/libnut.changes 2008-01-15 18:13:37.000000000 +0100
+++ /mounts/work_src_done/STABLE/libnut/libnut.changes 2008-04-28 14:50:47.000000000 +0200
@@ -1,0 +2,9 @@
+Mon Apr 28 14:37:56 CEST 2008 - sbrabec@suse.cz
+
+- Updated to the latest SVN snapshot 658:
+ * Documentation fixes.
+ * Code cleanup.
+ * Debugging messages cleanup.
+- Enabled shared library support.
+
+-------------------------------------------------------------------
Old:
----
nut-svn514.tar.bz2
New:
----
libnut-shared.patch
nut-svn658.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libnut.spec ++++++
--- /var/tmp/diff_new_pack.zm2607/_old 2008-04-28 17:54:22.000000000 +0200
+++ /var/tmp/diff_new_pack.zm2607/_new 2008-04-28 17:54:22.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package libnut (Version 0.0.514)
+# spec file for package libnut (Version 0.0.658)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -10,10 +10,11 @@
# norootforbuild
+
Name: libnut
# There is already package named nut: Network UPS Tools
%define _name nut
-Version: 0.0.514
+Version: 0.0.658
Release: 1
Url: http://wiki.multimedia.cx/index.php?title=NUT
License: X11/MIT
@@ -23,18 +24,81 @@
# svn checkout svn://svn.mplayerhq.hu/nut/src/trunk nut ; tar -jcf nut-svn$(svn info nut | sed -n 's/Revision: //p').tar.bz2 nut
Source: %{_name}-svn%(echo %{version} | sed 's/.*\.//').tar.bz2
Patch: libnut-libdir.patch
-# We don't yet create -devel package:
-# - No shared library support.
-# - Provided binaries are more or less debugging tools.
-Provides: %{name}-devel = %{version}-%{release}
+Patch1: libnut-shared.patch
%description
-Library for manipulation with NUT multimedia streams. Unlike many
-popular containers, a NUT file can largely be viewed as a byte stream,
-opposed to having a global block structure. NUT files consist of a
-sequence of packets, which can contain global headers, file metadata,
-stream headers for the individual media streams, optional index data to
-accelerate seeking, and, of course, the actual encoded media frames.
+Library for manipulation with NUT multimedia streams.
+
+Unlike many popular containers, a NUT file can largely be viewed as a
+byte stream, opposed to having a global block structure. NUT files
+consist of a sequence of packets, which can contain global headers,
+file metadata, stream headers for the individual media streams,
+optional index data to accelerate seeking, and, of course, the actual
+encoded media frames.
+
+
+
+Authors:
+--------
+ Oded Shimon
+
+%package -n libnut0
+License: X11/MIT
+Group: System/Libraries
+Summary: NUT Multimedia Container Library
+
+%description -n libnut0
+Library for manipulation with NUT multimedia streams.
+
+Unlike many popular containers, a NUT file can largely be viewed as a
+byte stream, opposed to having a global block structure. NUT files
+consist of a sequence of packets, which can contain global headers,
+file metadata, stream headers for the individual media streams,
+optional index data to accelerate seeking, and, of course, the actual
+encoded media frames.
+
+
+
+Authors:
+--------
+ Oded Shimon
+
+%package devel
+License: X11/MIT
+Group: Development/Libraries/C and C++
+Summary: NUT Multimedia Container Library
+Requires: libnut0 = %{version}
+
+%description devel
+Library for manipulation with NUT multimedia streams.
+
+Unlike many popular containers, a NUT file can largely be viewed as a
+byte stream, opposed to having a global block structure. NUT files
+consist of a sequence of packets, which can contain global headers,
+file metadata, stream headers for the individual media streams,
+optional index data to accelerate seeking, and, of course, the actual
+encoded media frames.
+
+
+
+Authors:
+--------
+ Oded Shimon
+
+%package utils
+License: X11/MIT
+Group: Productivity/Multimedia/Other
+Summary: NUT Multimedia Container Utilites
+
+%description utils
+Utilities for manipulation with NUT multimedia streams.
+
+Unlike many popular containers, a NUT file can largely be viewed as a
+byte stream, opposed to having a global block structure. NUT files
+consist of a sequence of packets, which can contain global headers,
+file metadata, stream headers for the individual media streams,
+optional index data to accelerate seeking, and, of course, the actual
+encoded media frames.
@@ -45,30 +109,46 @@
%prep
%setup -q -n %{_name}
%patch
+%patch1
+echo "CFLAGS += $RPM_OPT_FLAGS" >>config.mak
%build
-# Use -fPIC: This code is linked to shared libraries in other projects.
-make %{?jobs:-j%jobs} CFLAGS="$RPM_OPT_FLAGS -fPIC -I$PWD/libnut"
-cd nututils
-make %{?jobs:-j%jobs} CFLAGS="$RPM_OPT_FLAGS -fPIC -I$PWD/../libnut"
-cd ..
+make %{?jobs:-j%jobs} prefix=%{_prefix} libdir=%{_libdir}
%install
-%makeinstall prefix=$RPM_BUILD_ROOT%{_prefix} libdir=$RPM_BUILD_ROOT%{_libdir}
-install -d $RPM_BUILD_ROOT%{_bindir}
-install nututils/{nutmerge,nutindex,nutparse,avireader} $RPM_BUILD_ROOT%{_bindir}
+%makeinstall prefix=$RPM_BUILD_ROOT%{_prefix} libdir=$RPM_BUILD_ROOT%{_libdir} install-libnut-shared
+%makeinstall prefix=$RPM_BUILD_ROOT%{_prefix} libdir=$RPM_BUILD_ROOT%{_libdir} install-libnut-headers
+%makeinstall prefix=$RPM_BUILD_ROOT%{_prefix} libdir=$RPM_BUILD_ROOT%{_libdir} install-nututils
+rm $RPM_BUILD_ROOT%{_libdir}/*.a
%clean
rm -rf $RPM_BUILD_ROOT
-%files
+%post -n libnut0 -p /sbin/ldconfig
+
+%postun -n libnut0 -p /sbin/ldconfig
+
+%files utils
%defattr(-,root,root)
-%doc COPYING README docs/*.xml docs/*.txt
%{_bindir}/*
+
+%files devel
+%defattr(-,root,root)
%{_includedir}/*.h
-%{_libdir}/*.a
+%{_libdir}/*.so
+
+%files -n libnut0
+%defattr(-,root,root)
+%doc COPYING README
+%{_libdir}/*.so.*
%changelog
+* Mon Apr 28 2008 sbrabec@suse.cz
+- Updated to the latest SVN snapshot 658:
+ * Documentation fixes.
+ * Code cleanup.
+ * Debugging messages cleanup.
+- Enabled shared library support.
* Tue Jan 15 2008 sbrabec@suse.cz
- Minor spec file cleanup.
- Updated to the latest SVN snapshot 514 (no change).
++++++ libnut-libdir.patch ++++++
--- /var/tmp/diff_new_pack.zm2607/_old 2008-04-28 17:54:22.000000000 +0200
+++ /var/tmp/diff_new_pack.zm2607/_new 2008-04-28 17:54:23.000000000 +0200
@@ -1,33 +1,48 @@
---- config.mak
-+++ config.mak
-@@ -1,5 +1,7 @@
- PREFIX = /usr/local
- prefix = $(DESTDIR)$(PREFIX)
-+libdir = $(prefix)/lib
-+includedir = $(prefix)/include
+--- Makefile
++++ Makefile
+@@ -28,16 +28,16 @@
+ install: install-libnut install-nututils
- CFLAGS = -Os -Wall -g
- #CFLAGS = -fomit-frame-pointer -g -Wall
---- libnut/Makefile
-+++ libnut/Makefile
-@@ -5,14 +5,14 @@
- all: libnut.a
+ install-libnut: libnut install-libnut-headers
+- install -d $(prefix)/lib
+- install -m 644 libnut/libnut.a $(prefix)/lib
++ install -d $(libdir)
++ install -m 644 libnut/libnut.a $(libdir)
- install:
+ install-libnut-shared: libnut/libnut.so install-libnut-headers
- install -d $(prefix)/lib
-- install -m 644 libnut.a $(prefix)/lib
-- install -d $(prefix)/include
-- install -m 644 libnut.h $(prefix)/include
+- install -m 644 libnut/libnut.so $(prefix)/lib
+ install -d $(libdir)
-+ install -m 644 libnut.a $(libdir)
++ install -m 644 libnut/libnut.so $(libdir)
+
+ install-libnut-headers:
+- install -d $(prefix)/include
+- install -m 644 libnut/libnut.h $(prefix)/include
+ install -d $(includedir)
-+ install -m 644 libnut.h $(includedir)
++ install -m 644 libnut/libnut.h $(includedir)
+
+ install-nututils: nututils
+ install -d $(prefix)/bin
+@@ -46,9 +46,9 @@
+ uninstall: uninstall-libnut uninstall-nututils
- uninstall:
+ uninstall-libnut:
- rm -f $(prefix)/lib/libnut.a
+- rm -f $(prefix)/lib/libnut.so
- rm -f $(prefix)/include/libnut.h
+ rm -f $(libdir)/libnut.a
++ rm -f $(libdir)/libnut.so
+ rm -f $(includedir)/libnut.h
- libnut.a: ${OBJS}
- rm -f $@
+ uninstall-nututils:
+ rm -f $(addprefix $(prefix)/bin/, $(subst nututils/,,$(NUTUTILS_PROGS)))
+--- config.mak
++++ config.mak
+@@ -1,5 +1,7 @@
+ PREFIX = /usr/local
+ prefix = $(DESTDIR)$(PREFIX)
++libdir = $(prefix)/lib
++includedir = $(prefix)/include
+
+ #CFLAGS += -DDEBUG
+
++++++ libnut-shared.patch ++++++
--- Makefile
+++ Makefile
@@ -6,7 +6,7 @@
all: libnut nututils
-libnut: libnut/libnut.a
+libnut: libnut/libnut.a libnut/libnut.so
libnut/libnut.a: $(LIBNUT_OBJS)
rm -f $@
@@ -14,14 +14,16 @@
$(RANLIB) $@
libnut/libnut.so: $(LIBNUT_OBJS)
- $(CC) $(CFLAGS) -shared $^ -o $@
+ $(CC) $(CFLAGS) -shared -Wl,--rpath -Wl,$(libdir) -Wl,--export-dynamic -Wl,-soname -Wl,libnut.so.0 $^ -o libnut/libnut.so.0
+ ln -s -f libnut.so.0 $@
$(LIBNUT_OBJS): libnut/priv.h libnut/libnut.h
+$(LIBNUT_OBJS): CFLAGS += -fPIC -DPIC
nututils: $(NUTUTILS_PROGS)
$(NUTMERGE_OBJS): nututils/nutmerge.h
-nututils/nutmerge: $(NUTMERGE_OBJS) libnut/libnut.a
+nututils/nutmerge: $(NUTMERGE_OBJS) libnut/libnut.so
$(NUTUTILS_PROGS): CFLAGS += -Ilibnut
@@ -33,7 +35,8 @@
install-libnut-shared: libnut/libnut.so install-libnut-headers
install -d $(libdir)
- install -m 644 libnut/libnut.so $(libdir)
+ install -m 644 libnut/libnut.so.0 $(libdir)
+ ln -s -f libnut.so.0 $(libdir)/libnut.so
install-libnut-headers:
install -d $(includedir)
++++++ nut-svn514.tar.bz2 -> nut-svn658.tar.bz2 ++++++
++++ 2826 lines of diff (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org