[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/libannodex/devel libannodex.autotools.patch, NONE, 1.1 libannodex.cmml.patch, NONE, 1.1 libannodex.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2



Author: thomasvs

Update of /cvs/extras/rpms/libannodex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12334/devel

Modified Files:
	.cvsignore sources 
Added Files:
	libannodex.autotools.patch libannodex.cmml.patch 
	libannodex.spec 
Log Message:
auto-import libannodex-0.6.2-1.fc4 on branch devel from libannodex-0.6.2-1.fc4.src.rpm

libannodex.autotools.patch:

--- NEW FILE libannodex.autotools.patch ---
diff -Naur libannodex-0.6.2/configure.ac libannodex-0.6.2.patched/configure.ac
--- libannodex-0.6.2/configure.ac	2005-04-14 16:04:46.000000000 +0200
+++ libannodex-0.6.2.patched/configure.ac	2005-06-07 18:55:26.000000000 +0200
@@ -286,17 +286,10 @@
 dnl Set IMPORTERS_DIR
 dnl
 
-IMPORTERS_DIR="${libdir}/annodex/importers"
-AC_SUBST(IMPORTERS_DIR)
-if test "x${prefix}" = xNONE; then
-  importers_dir="${ac_default_prefix}/lib/annodex/importers"
-else
-  importers_dir="${prefix}/lib/annodex/importers"
-fi
-AC_DEFINE_UNQUOTED(IMPORTERS_DIR, "$importers_dir",
+AS_AC_EXPAND(IMPORTERS_DIR, ${libdir}/annodex/importers)
+AC_DEFINE_UNQUOTED(IMPORTERS_DIR, "$IMPORTERS_DIR",
                    [Directory in which importer plugins are installed])
 
-
 dnl
 dnl  Configuration tests complete -- provide summary of results.
 dnl
@@ -370,6 +363,11 @@
 annodex.pc
 ])
 
+AS_AC_EXPAND(LIBDIR, ${libdir})
+AS_AC_EXPAND(INCLUDEDIR, ${includedir})
+AS_AC_EXPAND(BINDIR, ${bindir})
+AS_AC_EXPAND(DOCDIR, ${datadir}/doc)
+
 AC_MSG_RESULT([
 ------------------------------------------------------------------------
   $PACKAGE $VERSION:  Automatic configuration OK.
@@ -390,11 +388,11 @@
 
   Installation paths:
 
-    libannodex: .................. ${prefix}/lib
-    Importers: ................... ${importers_dir}
-    Tools: ....................... ${prefix}/bin
-    C header files: .............. ${prefix}/include/$PACKAGE
-    Documentation: ............... ${prefix}/share/doc/$PACKAGE
+    libannodex: .................. ${LIBDIR}
+    C header files: .............. ${INCLUDEDIR}/$PACKAGE
+    Importers: ................... ${IMPORTERS_DIR}
+    Tools: ....................... ${BINDIR}
+    Documentation: ............... ${DOCDIR}/$PACKAGE
 
   ${TESTS_INFO}
 
diff -Naur libannodex-0.6.2/include/annodex/Makefile.am libannodex-0.6.2.patched/include/annodex/Makefile.am
--- libannodex-0.6.2/include/annodex/Makefile.am	2005-02-28 23:25:23.000000000 +0100
+++ libannodex-0.6.2.patched/include/annodex/Makefile.am	2005-06-03 18:11:57.000000000 +0200
@@ -1,8 +1,8 @@
 ## Process this file with automake to produce Makefile.in
 
 # Include files to install
-includedir = $(prefix)/include/annodex
-include_HEADERS = \
+annodexincludedir = $(includedir)/annodex
+annodexinclude_HEADERS = \
 	anx_deprecated.h \
 	anx_list.h anx_params.h anx_core.h \
 	annodex.h anx_constants.h anx_int64.h anx_types.h \
diff -Naur libannodex-0.6.2/m4/as-ac-expand.m4 libannodex-0.6.2.patched/m4/as-ac-expand.m4
--- libannodex-0.6.2/m4/as-ac-expand.m4	1970-01-01 01:00:00.000000000 +0100
+++ libannodex-0.6.2.patched/m4/as-ac-expand.m4	2005-06-03 18:31:51.000000000 +0200
@@ -0,0 +1,43 @@
+dnl as-ac-expand.m4 0.2.0
+dnl autostars m4 macro for expanding directories using configure's prefix
+dnl thomas apestaart org
+
+dnl AS_AC_EXPAND(VAR, CONFIGURE_VAR)
+dnl example
+dnl AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
+dnl will set SYSCONFDIR to /usr/local/etc if prefix=/usr/local
+
+AC_DEFUN([AS_AC_EXPAND],
+[
+  EXP_VAR=[$1]
+  FROM_VAR=[$2]
+
+  dnl first expand prefix and exec_prefix if necessary
+  prefix_save=$prefix
+  exec_prefix_save=$exec_prefix
+
+  dnl if no prefix given, then use /usr/local, the default prefix
+  if test "x$prefix" = "xNONE"; then
+    prefix="$ac_default_prefix"
+  fi
+  dnl if no exec_prefix given, then use prefix
+  if test "x$exec_prefix" = "xNONE"; then
+    exec_prefix=$prefix
+  fi
+
+  full_var="$FROM_VAR"
+  dnl loop until it doesn't change anymore
+  while true; do
+    new_full_var="`eval echo $full_var`"
+    if test "x$new_full_var" = "x$full_var"; then break; fi
+    full_var=$new_full_var
+  done
+
+  dnl clean up
+  full_var=$new_full_var
+  AC_SUBST([$1], "$full_var")
+
+  dnl restore prefix and exec_prefix
+  prefix=$prefix_save
+  exec_prefix=$exec_prefix_save
+])
diff -Naur libannodex-0.6.2/src/importers/Makefile.am libannodex-0.6.2.patched/src/importers/Makefile.am
--- libannodex-0.6.2/src/importers/Makefile.am	2005-02-28 23:25:28.000000000 +0100
+++ libannodex-0.6.2.patched/src/importers/Makefile.am	2005-06-03 18:37:17.000000000 +0200
@@ -4,7 +4,9 @@
 
 INCLUDES = -I$(top_srcdir)/include $(OGGZ_CFLAGS)
 
-libdir = $(IMPORTERS_DIR)
+# don't use IMPORTERS_DIR from configure.ac; since that's decided at
+# configure time, and not at install time
+importerslibdir = $(libdir)/annodex/importers
 
 ANNODEXDIR = ../libannodex
 ANNODEX_LIBS = $(ANNODEXDIR)/libannodex.la $(OGGZ_LIBS) -lm
@@ -21,7 +23,7 @@
 import_sndfile = libanx_import_sndfile.la
 endif
 
-lib_LTLIBRARIES = \
+importerslib_LTLIBRARIES = \
 	libanx_import_anx.la \
 	$(import_cmml) \
 	$(import_ogg) \

libannodex.cmml.patch:

--- NEW FILE libannodex.cmml.patch ---
diff -Naur libannodex-0.6.2/src/importers/anx_import_cmml.c libannodex-0.6.2.cmml.patch/src/importers/anx_import_cmml.c
--- libannodex-0.6.2/src/importers/anx_import_cmml.c	2005-03-10 08:15:19.000000000 +0100
+++ libannodex-0.6.2.cmml.patch/src/importers/anx_import_cmml.c	2005-06-04 09:27:51.000000000 +0200
@@ -160,7 +160,7 @@
   if (ac->import_import) {
 
     presentation_time = ac->start_time;
-    basetime = stream->timebase ? stream->timebase->t.sec : 0.0;
+    basetime = stream->basetime ? stream->basetime->t.sec : 0.0;
     utc = stream->utc ? stream->utc->tstr : NULL;
 
     ac->import_stream (presentation_time, basetime, utc, ac->import_user_data);


--- NEW FILE libannodex.spec ---
Name:           libannodex
Version:        0.6.2
Release:        1%{?dist}
Summary:        Library for annotating and indexing networked media

Group:          System Environment/Libraries
License:        BSD
URL:		http://www.annodex.net/
Source:		http://www.annodex.net/software/libannodex/download/%{name}-%{version}.tar.gz
# fixed in upstream CVS
Patch:		libannodex.autotools.patch
# fixed in upstream CVS
Patch1:		libannodex.cmml.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires(post): /sbin/ldconfig

BuildRequires:	doxygen
BuildRequires:	libogg-devel >= 1.0
BuildRequires:	liboggz-devel >= 0.9.1
BuildRequires:	libcmml-devel >= 0.8
BuildRequires:	libsndfile-devel

# libtool
BuildRequires:	gcc-c++

# since we patch Makefile.am
BuildRequires:  libtool
BuildRequires:  automake
BuildRequires:  autoconf
BuildRequires:  pkgconfig

%description
libannodex is a library to provide reading and writing of Annodex
files and streams.

%package devel
Summary:	Files needed for development using libannodex
Group:          Development/Libraries
Requires:       libannodex = %{version}
Requires:       liboggz-devel >= 0.9.1
Requires:       pkgconfig

%description devel
libannodex is a library to provide reading and writing of Annodex
files and streams.

This package contains the header files and documentation needed for
development using libannodex.

%prep
%setup -q -n %{name}-%{version}
%patch -p1
%patch1 -p1

%build
aclocal -I m4
autoconf
automake
%configure
make

%install
rm -rf $RPM_BUILD_ROOT
%makeinstall

# remove unpackaged files from the buildroot
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
rm -f $RPM_BUILD_ROOT%{_libdir}/annodex/importers/*.la

# remove doxygen build stamp; fixed in upstream CVS
rm -f $RPM_BUILD_ROOT%{_datadir}/doc/libannodex/doxygen-build.stamp

%clean
rm -rf $RPM_BUILD_ROOT
                                                                                
%files
%defattr(-,root,root)
%doc AUTHORS ChangeLog COPYING README
# NEWS is empty in 0.6.2
# %doc NEWS
%{_libdir}/libannodex.so.*
%{_bindir}/anx*
%dir %{_libdir}/annodex/importers
%{_libdir}/annodex/importers/libanx*.so*
%{_mandir}/man1/*

%files devel
%defattr(-,root,root)
%{_libdir}/libannodex.so
%{_libdir}/libannodex.a
%{_libdir}/pkgconfig/annodex.pc
%doc %{_docdir}/libannodex
%{_includedir}/annodex/*.h
%{_libdir}/annodex/importers/libanx*.a

%post
/sbin/ldconfig
# this allows the library to have text relocations
# this is needed so that mod_annodex does not stop httpd from starting
chcon -t texrel_shlib_t %{_libdir}/libannodex.so.*
exit 0


%postun -p /sbin/ldconfig

%changelog
* Mon Jun 13 2005 Thomas Vander Stichele <thomas at apestaart dot org>
- 0.6.2-2: add dist tag

* Fri Jun 03 2005 Thomas Vander Stichele <thomas at apestaart dot org>
- 0.6.2-1: initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libannodex/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Jun 2005 18:38:55 -0000	1.1
+++ .cvsignore	13 Jun 2005 18:39:39 -0000	1.2
@@ -0,0 +1 @@
+libannodex-0.6.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libannodex/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Jun 2005 18:38:55 -0000	1.1
+++ sources	13 Jun 2005 18:39:39 -0000	1.2
@@ -0,0 +1 @@
+496b920a5fd4d11fa75c6f7e47a521c2  libannodex-0.6.2.tar.gz


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]