From 35c9a03503a6ed8dbc73a43113e40aab328e63236dbe3264b971535ea8d8b8c9 Mon Sep 17 00:00:00 2001
From: "Dr. Werner Fink" <werner@suse.com>
Date: Tue, 19 Jun 2012 14:18:50 +0000
Subject: [PATCH] .

OBS-URL: https://build.opensuse.org/package/show/Publishing:TeXLive/texlive?expand=0&rev=98
---
 texlive-filesystem.spec | 8 +++++++-
 texlive.spec            | 3 ++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/texlive-filesystem.spec b/texlive-filesystem.spec
index 0008b77..35fc93d 100644
--- a/texlive-filesystem.spec
+++ b/texlive-filesystem.spec
@@ -17,7 +17,7 @@
 
 %define texlive_version 2012
 %define texlive_release 20120611
-%define texlive_noarch  41
+%define texlive_noarch  42
 %define texlive_source  texlive-20120611-source
 
 %define __perl_requires		%{nil}
@@ -48,6 +48,7 @@ Requires(verify): permissions
 Obsoletes:      tetex
 BuildRequires:  ed
 BuildRequires:  fontconfig
+BuildConflicts: texinfo
 Source10:       rc.config.texlive
 Source11:       SuSEconfig.texlive
 Source12:       texlive.cron
@@ -4011,6 +4012,9 @@ two onto a DIN A4 page (a4toa5) are included. The number of pages must
 be even (which can be done by odd2even or dvibook).
 
 %prep
+pushd %_sourcedir
+    chmod g-w *.tar.xz
+popd
 %setup -c -q -n %name -T
 %build
 %install
@@ -11018,6 +11022,8 @@ fi
 %dir %{_texmfdistdir}/scripts/thumbpdf
 %dir %{_texmfdistdir}/scripts/ulqda
 %dir %{_texmfdistdir}/scripts/vpe
+%dir %{_x11data}
+%dir %{_x11data}/app-defaults
 %dir %{_texmfdistdir}/bibtex
 %dir %{_texmfdistdir}/bibtex/bib
 %dir %{_texmfdistdir}/bibtex/bib/IEEEtran
diff --git a/texlive.spec b/texlive.spec
index ac9338f..8510718 100644
--- a/texlive.spec
+++ b/texlive.spec
@@ -17,7 +17,7 @@
 
 %define texlive_version 2012
 %define texlive_release 20120611
-%define texlive_noarch  41
+%define texlive_noarch  42
 %define texlive_source  texlive-20120611-source
 
 %define __perl_requires		%{nil}
@@ -115,6 +115,7 @@ BuildRequires:  readline-devel
 BuildRequires:  %{name}-filesystem
 BuildRequires:  t1lib
 BuildRequires:  t1lib-devel
+BuildConflicts: texinfo
 BuildRequires:  unzip
 BuildRequires:  xaw3d-devel
 BuildRequires:  xorg-x11-devel