summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
Diffstat (limited to 'misc')
-rw-r--r--misc/Makefile.am11
-rw-r--r--misc/xine-lib.spec.in5
2 files changed, 3 insertions, 13 deletions
diff --git a/misc/Makefile.am b/misc/Makefile.am
index 9c774b6ab..4382df10e 100644
--- a/misc/Makefile.am
+++ b/misc/Makefile.am
@@ -9,17 +9,6 @@ data_DATA = xine_logo.png xine_logo.mpg
bin_SCRIPTS = xine-config
-if HAVE_IMLIB
-logoconv = xine-logoconv
-endif
-
-bin_PROGRAMS = $(logoconv)
-
-CFLAGS = $(IMLIB_CFLAGS)
-xine_logoconv_SOURCES = xine-logoconv.c
-xine_logoconv_LDADD = $(IMLIB_LIBS)
-
-
debug:
install-debug: install
diff --git a/misc/xine-lib.spec.in b/misc/xine-lib.spec.in
index 0d42fd428..34a6c9196 100644
--- a/misc/xine-lib.spec.in
+++ b/misc/xine-lib.spec.in
@@ -285,11 +285,10 @@ rm -rf $RPM_BUILD_ROOT
%{prefix}/lib/xine/plugins/xineplug_vo_out_xshm.la
%{prefix}/lib/xine/plugins/xineplug_vo_out_xshm.so
# lib, logo and fonts.
-@HAVE_IMLIB_TRUE@%{prefix}/bin/xine-logoconv
%{prefix}/lib/libxine*.la
%{prefix}/lib/libxine*.so*
%{prefix}/share/xine/skins/xine_logo.png
-%{prefix}/share/xine/skins/xine_logo.zyuy2
+%{prefix}/share/xine/skins/xine_logo.mpg
%{prefix}/share/xine/fonts/*
## intl files
%{prefix}/share/locale/fr/LC_MESSAGES/xine-lib.mo
@@ -365,6 +364,8 @@ rm -rf $RPM_BUILD_ROOT
%{prefix}/share/doc/xine/xine-lib-API/*
%changelog
+* Thu May 2 2002 Daniel Caujolle-Bert <f1rmb@users.sourceforge.net>
+- sync with new logo stuff.
* Wed May 1 2002 Matthias Dahl <matthew2k@web.de>
- added cinepak, cyuv and msvc decode plugins
- commented out sdl related parts because this is currently broken in xine-lib