Author: sergiomb
Update of /cvs/free/rpms/gpac/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv14506
Modified Files:
.cvsignore gpac.spec sources
Log Message:
* Mon Sep 15 2014 Sérgio Basto <sergio(a)serjux.com> - 0.5.0-11.20140915svn
- Update to 20140915
- Some clean ups, fix location of html files.
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/gpac/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore 14 Sep 2013 13:19:02 -0000 1.12
+++ .cvsignore 15 Sep 2014 04:18:03 -0000 1.13
@@ -1 +1 @@
-gpac-20130914.tar.xz
+gpac-20140915.tar.xz
Index: gpac.spec
===================================================================
RCS file: /cvs/free/rpms/gpac/devel/gpac.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- gpac.spec 7 Aug 2014 01:24:30 -0000 1.51
+++ gpac.spec 15 Sep 2014 04:18:03 -0000 1.52
@@ -7,7 +7,7 @@
# - Fix unused-direct-shlib-dependency on libgpac
%global osmo Osmo4
-%global svn 20130914
+%global svn 20140915
# Mozilla stuff fails. It's completely disabled for now.
%global mozver 3.0
%global geckover 2.0.0
@@ -17,14 +17,13 @@
Name: gpac
Summary: MPEG-4 multimedia framework
Version: 0.5.0
-Release: 10%{?svn:.%{svn}svn}%{?dist}
+Release: 11%{?svn:.%{svn}svn}%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
URL:
http://gpac.sourceforge.net/
#Source0:
http://downloads.sourceforge.net/gpac/gpac-%{version}.tar.gz
Source0: gpac-%{svn}.tar.xz
Source9: gpac-snapshot.sh
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
BuildRequires: ImageMagick
BuildRequires: SDL-devel
@@ -52,7 +51,7 @@
BuildRequires: wxGTK-devel
BuildRequires: xmlrpc-c-devel
%{?_with_mozilla:BuildRequires: gecko-devel}
-BuildRequires: doxygen
+BuildRequires: doxygen graphviz
BuildRequires: desktop-file-utils
%{?_with_amr:BuildRequires: amrnb-devel amrwb-devel}
BuildRequires: gtk+-devel
@@ -192,11 +191,8 @@
# install
}
-# Parallele build will fail
-make all
-#{?_smp_mflags}
-make sggen
-#{?_smp_mflags}
+make %{?_smp_mflags} all
+make %{?_smp_mflags} sggen
## kwizart - build doxygen doc for devel
pushd doc
@@ -204,7 +200,6 @@
popd
%install
-rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install install-lib INSTFLAGS="-p"
%{?_with_mozilla:
@@ -252,7 +247,7 @@
done
#Fix doxygen timestamp
-touch -r Changelog doc/html/*
+touch -r Changelog doc/html-libgpac/*
#config.h like but not only
#Usual multilib bug
https://bugzilla.rpmfusion.org/show_bug.cgi?id=270
@@ -263,9 +258,6 @@
rm $RPM_BUILD_ROOT%{_includedir}/gpac/config.h
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
@@ -306,7 +298,7 @@
%files doc
%defattr(-,root,root,-)
-%doc doc/html/*
+%doc doc/html-libgpac/*
%files devel
%defattr(-,root,root,-)
@@ -320,6 +312,10 @@
%changelog
+* Mon Sep 15 2014 Sérgio Basto <sergio(a)serjux.com> - 0.5.0-11.20140915svn
+- Update to 20140915
+- Some clean ups, fix location of html files.
+
* Thu Aug 07 2014 Sérgio Basto <sergio(a)serjux.com> - 0.5.0-10.20130914svn
- Rebuilt for ffmpeg-2.3
Index: sources
===================================================================
RCS file: /cvs/free/rpms/gpac/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources 14 Sep 2013 13:19:02 -0000 1.12
+++ sources 15 Sep 2014 04:18:03 -0000 1.13
@@ -1 +1 @@
-448b52e8ae09355685b61a3767b83e56 gpac-20130914.tar.xz
+4e3d305fa9a21deed48659316fbbe619 gpac-20140915.tar.xz