Fix include

el8
Nicolas Chauvet 14 years ago
parent 991da26899
commit 2828acd1fa

@ -1,12 +0,0 @@
diff -up gpac/include/gpac/setup.h.noinclude gpac/include/gpac/setup.h
--- gpac/include/gpac/setup.h.noinclude 2010-04-26 15:23:51.000000000 +0200
+++ gpac/include/gpac/setup.h 2010-12-12 01:42:49.088146415 +0100
@@ -33,8 +33,6 @@ extern "C" {
This is only needed when building libgpac and modules when libgpac is not installed*/
#ifdef GPAC_HAVE_CONFIG_H
# include "config.h"
-#else
-# include <gpac/configuration.h>
#endif

@ -17,7 +17,7 @@
Name: gpac
Summary: MPEG-4 multimedia framework
Version: 0.4.6
Release: 0.10.cvs%{?cvs}%{?dist}
Release: 0.11.cvs%{?cvs}%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
URL: http://gpac.sourceforge.net/
@ -32,7 +32,6 @@ Patch5: gpac-0.4.6-js_cflags.patch
#https://sourceforge.net/tracker/?func=detail&atid=571740&aid=2853857&group_id=84101
Patch9: gpac-0.4.6-ffmpeg.patch
Patch11: gpac-0.4.6-osmo.patch
Patch12: gpac-0.4.6-noinclude.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
BuildRequires: ImageMagick
@ -154,7 +153,6 @@ web browsers.
%patch5 -p1 -b .jscflags
%patch9 -p1 -b .ffmpeg
%patch11 -p1 -b .osmo
%patch12 -p1 -b .noinclude
## kwizart - enable dynamic mode - hardcoded with patch2
# define SONAME number from the first number of gpac version.
@ -276,8 +274,8 @@ done
#Fix doxygen timestamp
touch -r Changelog doc/html/*
#Fix header installed by misstake
rm $RPM_BUILD_ROOT%{_includedir}/gpac/configuration.h
#config.h like but not only
touch -r Changelog $RPM_BUILD_ROOT%{_includedir}/gpac/configuration.h
%clean
@ -336,7 +334,7 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Sun Dec 12 2010 Nicolas Chauvet <kwizart@gmail.com> - 0.4.6-0.10.cvs20100527
* Tue Dec 14 2010 Nicolas Chauvet <kwizart@gmail.com> - 0.4.6-0.11.cvs20100527
- Fix include - rfbz#1551
* Sun Jul 11 2010 Nicolas Chauvet <kwizart@gmail.com> - 0.4.6-0.9.cvs20100527

Loading…
Cancel
Save