- rel 6; avoid -L/usr/lib

Changed files:
    gpac-flags.patch -> 1.2
    gpac.spec -> 1.38

diff --git a/gpac-flags.patch b/gpac-flags.patch
index f9095190440bbe3e8839b424fa7b8df98cf04969..ae8adc8d77aaebf5f400cc7f893192317a6e1609 100644 (file)
--- a/gpac-flags.patch
+++ b/gpac-flags.patch
@@ -20,3 +20,52 @@
  
  %.o: %.cpp
        $(CXX) $(CFLAGS) $(INSTALL_FLAGS) $(WX_CFLAGS) -c -o $@ $< 
+--- gpac/src/Makefile~ 2011-07-24 16:46:39.000000000 +0200
++++ gpac/src/Makefile  2011-07-24 16:53:33.607729885 +0200
+@@ -106,14 +106,6 @@
+ endif
+ 
+ 
+-ifneq ($(prefix), /usr/local)
+-EXTRALIBS+=-L$(prefix)/lib
+-else
+-ifneq ($(prefix), /usr)
+-EXTRALIBS+=-L$(prefix)/lib
+-endif
+-endif
+-
+ ## libgpac compositor compilation options
+ COMPOSITOR_CFLAGS=
+ ## SVG disabled
+--- gpac/applications/mp4client/Makefile~      2011-07-24 16:54:03.000000000 +0200
++++ gpac/applications/mp4client/Makefile       2011-07-24 16:57:28.613989434 +0200
+@@ -37,18 +37,6 @@
+ PROG=MP4Client
+ endif
+ 
+-ifneq ($(CONFIG_JPEG), no)
+-LINKLIBS+= -L$(prefix)/lib
+-else
+-ifneq ($(CONFIG_PNG), no)
+-LINKLIBS+= -L$(prefix)/lib
+-else
+-ifneq ($(TRISCOPE_MODE), no)
+-LINKLIBS+= -L$(prefix)/lib
+-endif
+-endif
+-endif
+-
+ ifeq ($(CONFIG_JPEG), no)
+ else
+ LINKLIBS+= -ljpeg
+--- gpac/modules/jack/Makefile~        2008-11-24 10:14:19.000000000 +0100
++++ gpac/modules/jack/Makefile 2011-07-24 17:01:53.625253667 +0200
+@@ -32,7 +32,7 @@
+ all: $(LIB)
+ 
+ $(LIB): $(OBJSPIC)
+-      $(CC) $(SHFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac -L/usr/lib  -ljack
++      $(CC) $(SHFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac -ljack
+ 
+ 
+ %.o: %.c

diff --git a/gpac.spec b/gpac.spec
index 4f66987f6f1eed8eb709173752c7304d4c8280b4..e3d46d15f49162be2362457db3086efec5e5cbcb 100644 (file)
--- a/gpac.spec
+++ b/gpac.spec
@@ -15,7 +15,7 @@ Summary:      GPAC - an implementation of the MPEG-4 Systems standard (ISO/IEC 14496-
 Summary(pl.UTF-8):     GPAC - implementacja standardu MPEG-4 Systems (ISO/IEC 14496-1)
 Name:          gpac
 Version:       0.4.5
-Release:       5
+Release:       6
 License:       LGPL v2+
 Group:         Applications/Multimedia
 Source0:       http://downloads.sourceforge.net/gpac/%{name}-%{version}.tar.gz