Browse Source

xorg-x11-server: remove patches
gnome-session: add patch
gdm: remove unused configure options

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@9814 ec354946-7b23-47d6-9f5a-488ba84defc7

Takemikaduchi 8 years ago
parent
commit
39a19824f1

+ 4 - 3
g/gdm/gdm-vl.spec

@@ -16,7 +16,7 @@ Summary: The GNOME Display Manager
 Summary(ja): GNOME ディスプレイマネージャ
 Name: gdm
 Version: 3.16.4
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 License: GPLv2+
 Group: User Interface/X
 URL: http://download.gnome.org/sources/gdm
@@ -137,8 +137,6 @@ intltoolize --force --copy
         --enable-console-helper \
         --with-console-kit \
         --enable-split-authentication=yes \
-		--enable-profiling \
-		--enable-debug \
         --without-selinux \
         --without-systemd 
 
@@ -334,6 +332,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 
 
 %changelog
+* Mon Nov 16 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.16.4-2
+- remove unused configure options
+
 * Sat Oct 10 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.16.4-1
 - new upstream release
 

+ 8 - 1
g/gnome-session/gnome-session-vl.spec

@@ -11,7 +11,7 @@ Summary: GNOME session manager
 Summary(ja): GNOME セッションマネージャ
 Name: gnome-session
 Version: 3.18.1.2
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 URL: http://www.gnome.org/
 License: GPLv2+ 
 Group: User Interface/Desktops
@@ -22,6 +22,9 @@ Source2: gnome.desktop
 
 Patch0:	gnome-session-3.14.0-hardware-compatibility.patch
 
+# patch for Vine
+Patch1000: gnome-session-3.18.1.2-ignore-gsm-fail.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -58,6 +61,7 @@ GNOME components and handles logout and saving the session.
 %prep
 %setup -q
 %patch0 -p1
+%patch1000 -p1
 
 %build
 #export CFLAGS="$CFLAGS -Wno-deprecated-declarations"
@@ -135,6 +139,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 
 
 %changelog
+* Mon Nov 16 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.18.1.2-2
+- add Patch1000 (gnome-session-3.18.1.2-ignore-gsm-fail.patch)
+
 * Sun Nov 01 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.18.1.2-1
 - new upstream release
 

+ 4 - 15
x/xorg-x11-server/xorg-x11-server-vl.spec

@@ -6,7 +6,7 @@ Summary:   X.Org X11 X server
 Summary(ja):   X.Org X11 X サーバ
 Name:      xorg-x11-server
 Version:   1.17.4
-Release:   1%{?_dist_release}
+Release:   2%{?_dist_release}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -25,19 +25,11 @@ Source20: http://svn.exactcode.de/t2/trunk/package/xorg/xorg-server/xvfb-run.sh
 
 Patch5: xserver-1.8.1-pic-libxf86config.patch
 
-Patch2014:  xserver-1.12.1-projector-fb-size.patch
-
 # Trivial things to never merge upstream ever:
 # This really could be done prettier.
 Patch5002: xserver-1.12.1-ssh-isnt-local.patch
 
-# force mode debugging on for randr 1.2 drivers
-Patch6002: xserver-1.12.1-mode-debug.patch
-
-# needs to upstream this
-Patch6028: xserver-1.12.1-randr-error-debugging.patch
 Patch6030: xserver-1.16.2-right-of.patch
-Patch6033: xserver-1.6.99-default-modes.patch
 
 ## Vine Patch
 # autodetect nvidia driver
@@ -293,14 +285,8 @@ Xserver source code needed to build VNC server (Xvnc)
 
 %patch5 -p1 -b .pic-libxf86config
 
-%patch2014 -p1 -b .projector-fb-size
-
 %patch5002 -p1 -b .ssh-isnt-local
 
-%patch6002 -p1 -b .mode-debug
-
-# needs to upstream this
-%patch6028 -p1 -b .randr-error-debugging
 %patch6030 -p1 -b .right-of
 
 # Vine patch
@@ -544,6 +530,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Nov 16 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.17.4-2
+- remove Patch 2014,6002,6028,6033
+
 * Tue Nov 03 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.17.4-1
 - update to 1.17.4