Accepting request 110525 from home:jengelh:branches:X11:XOrg

- Add missing tarball
- Parallel build with %_smp_mflags
- Remove redundant sections

OBS-URL: https://build.opensuse.org/request/show/110525
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/tigervnc?expand=0&rev=2
This commit is contained in:
Stefan Dirsch 2012-03-22 11:18:23 +00:00 committed by Git OBS Bridge
parent f264e6c6cd
commit 6dc69e1a06
3 changed files with 10 additions and 9 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Mar 21 23:30:32 UTC 2012 - jengelh@medozas.de
- Add missing tarball
- Parallel build with %_smp_mflags
- Remove redundant sections
-------------------------------------------------------------------
Fri Feb 24 20:47:33 UTC 2012 - giecrilj@stegny.2a.pl

View File

@ -14,9 +14,6 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
%define tigervnc 1
%bcond_with Xstatic
%bcond_without dox
@ -56,7 +53,7 @@ Summary: A high-performance, platform-neutral implementation of VNC
Summary: Xvnc wrapper script which makes use of Xvfb/x11vnc
%endif
%if %tigervnc
Source1: http://netcologne.dl.sourceforge.net/project/%{name}/%{name}/%{version}/%{name}-%{version}.tar.gz
Source1: http://downloads.sf.net/tigervnc/%name-%version.tar.gz
%if %{with Xstatic}
Source2: xorg-server-1.9.3.tar.bz2
Patch: xorg-server-xdmcp.patch
@ -130,7 +127,7 @@ extern CDECL118 struct hostent *gethostbyname (const char *__name) __attribute__
'
%configure --disable-static --with-system-jpeg --with-system-zlib \
CFLAGS="$CFLAGS %{xcflags}" CXXFLAGS="$CXXFLAGS %{xcflags}"
make %{?jobs:-j %jobs}
make %{?_smp_mflags}
%if %{with Xstatic}
popd
: ./autogen.sh
@ -148,7 +145,7 @@ autoreconf -fiv -Werror
--disable-config-udev \
--without-dtrace \
--with-fontrootdir=/usr/share/fonts
%make_jobs
%make %{?_smp_mflags}
%endif %{nil with Xstatic}
%endif %{nil tigervnc}
@ -168,9 +165,6 @@ TCP="5801 5901"
EOF
%find_lang '%{name}'
%clean
rm -rf "$RPM_BUILD_ROOT"
%files -f ../../%{name}.lang
%defattr(-,root,root)
%config /etc/sysconfig/SuSEfirewall2.d/services/%{name}