Author: glen Date: Sat Apr 26 18:49:18 2008 GMT Module: SPECS Tag: HEAD ---- Log message: - pure build, no pld hacks
---- Files affected: SPECS: splashutils.spec (1.37 -> 1.38) ---- Diffs: ================================================================ Index: SPECS/splashutils.spec diff -u SPECS/splashutils.spec:1.37 SPECS/splashutils.spec:1.38 --- SPECS/splashutils.spec:1.37 Thu Apr 24 03:41:35 2008 +++ SPECS/splashutils.spec Sat Apr 26 20:49:12 2008 @@ -9,7 +9,7 @@ Summary(pl.UTF-8): Narzędzia do ustawiania splash Name: splashutils Version: 1.5.4 -Release: 0.3 +Release: 0.5 License: GPL Group: Applications/System Source0: http://dev.gentoo.org/~spock/projects/splashutils/archive/%{name}-%{version}.tar.bz2 @@ -78,9 +78,11 @@ %prep %setup -q -a1 +%if 0 %patch0 -p1 %patch1 -p1 %patch2 -p1 +%endif #%patch0 -p0 #%patch1 -p0 @@ -88,12 +90,14 @@ mv miscsplashutils-* miscsplashutils +%if 0 mkdir -p nobuild mv libs/freetype-* nobuild mv libs/jpeg-* nobuild mv libs/libpng-* nobuild mv libs/zlib-* nobuild mv configure{,.dist} +%endif %build if [ ! -f configure -o configure.ac -nt configure ]; then @@ -116,6 +120,7 @@ --with-ttf \ --with-ttf-kernel +%if 0 cd src %{__make} \ fbcondecor_helper @@ -124,14 +129,18 @@ # relink. as libtool discarded -static %{__cc} -static -Os -w -ffunction-sections -fdata-sections -I. -I/usr/include/freetype2 -I/usr/include -O2 -fno-strict-aliasing -fwrapv -march=i686 -mtune=pentium4 -gdwarf-2 -g2 -Wl,--as-needed -Wl,-z -Wl,relro -Wl,-z -Wl,-combreloc -o fbcondecor_helper fbcondecor_helper-kernel.o fbcondecor_helper-libfbsplash.o fbcondecor_helper-libfbsplashrender.o fbcondecor_helper-fbcon_decor.o fbcondecor_helper-common.o fbcondecor_helper-parse.o fbcondecor_helper-list.o fbcondecor_helper-render.o fbcondecor_helper-image.o fbcondecor_helper-effects.o fbcondecor_helper-ttf.o -ljpeg -lpng -lfreetype -lz -lm cd .. +%endif %{__make} -j1 \ %{?with_verbose:QUIET=false} +%if 0 %{__make} install DESTDIR=$(pwd)/initrd %{__make} clean %endif +%endif +%if 0 # build shared for system %configure \ --enable-klibc-shared \ @@ -146,6 +155,7 @@ %{__make} -j1 \ %{?with_verbose:QUIET=false} +%endif %{__make} -C miscsplashutils \ CC="%{__cc}" \ @@ -163,8 +173,8 @@ install miscsplashutils/{fbres,fbtruetype/{fbtruetype,fbtruetype.static}} $RPM_BUILD_ROOT%{_bindir} %if %{with initrd} -install -d $RPM_BUILD_ROOT%{_libdir}/initrd -install initrd/sbin/fbcondecor_helper $RPM_BUILD_ROOT%{_libdir}/initrd +#install -d $RPM_BUILD_ROOT%{_libdir}/initrd +#install initrd/sbin/fbcondecor_helper $RPM_BUILD_ROOT%{_libdir}/initrd %endif install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/splash @@ -223,8 +233,8 @@ %dir /var/run/splashutils # for initrd -%dir %{_libdir}/initrd -%{_libdir}/initrd/fbcondecor_helper +#%dir %{_libdir}/initrd +#%{_libdir}/initrd/fbcondecor_helper %files devel %defattr(644,root,root,755) @@ -247,6 +257,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.38 2008-04-26 18:49:12 glen +- pure build, no pld hacks + Revision 1.37 2008-04-24 01:41:35 glen - add fbres back - hack to build static fbcondecor_helper ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/splashutils.spec?r1=1.37&r2=1.38&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
