diff --git a/source-warns.dif b/source-warns.dif
index 99b50c9..95b3d9d 100644
--- a/source-warns.dif
+++ b/source-warns.dif
@@ -241,3 +241,27 @@
    }
    else {
      power = 10.0;
+--- texk/web2c/luatexdir/pdf/pdfcolorstack.w
++++ texk/web2c/luatexdir/pdf/pdfcolorstack.w	2012-04-24 08:05:42.714565533 +0000
+@@ -204,9 +204,7 @@ static int colorstackpush(int colstack_n
+     if (global_shipping_mode == SHIPPING_PAGE) {
+         if (colstack->page_used == colstack->page_size) {
+             colstack->page_size += STACK_INCREMENT;
+-            colstack->page_stack = xretalloc(colstack->page_stack,
+-                                             (unsigned) colstack->page_size,
+-                                             char *);
++            xretalloc(colstack->page_stack, (unsigned) colstack->page_size, char *);
+         }
+         colstack->page_stack[colstack->page_used++] = colstack->page_current;
+         str = makecstring(s);
+@@ -219,9 +217,7 @@ static int colorstackpush(int colstack_n
+     } else {
+         if (colstack->form_used == colstack->form_size) {
+             colstack->form_size += STACK_INCREMENT;
+-            colstack->form_stack = xretalloc(colstack->form_stack,
+-                                             (unsigned) colstack->form_size,
+-                                             char *);
++            xretalloc(colstack->form_stack, (unsigned) colstack->form_size, char *);
+         }
+         colstack->form_stack[colstack->form_used++] = colstack->form_current;
+         str = makecstring(s);
diff --git a/texlive-rpmlintrc b/texlive-rpmlintrc
index e9882a7..d7c5a95 100644
--- a/texlive-rpmlintrc
+++ b/texlive-rpmlintrc
@@ -4,5 +4,14 @@ addFilter(".*texlive-scheme-.*.noarch:.*:-*summary-not-capitalized.*")
 addFilter(".*texlive-.*noarch:.*:.*filename-too-long-for-joliet.*")
 addFilter(".*texlive-.*:.*:.*description-shorter-than-summary.*")
 addFilter(".*texlive-.*-devel\..*:.*:.*no-dependency-on.*")
-addFilter("texlive\..*no-manual-page-for-binary.*nobody.*")
-addFilter("texlive-.*-bin\..*no-manual-page-for-binary.*")
+addFilter(".*texlive\..*no-manual-page-for-binary.*nobody.*")
+addFilter(".*texlive-.*-bin\..*no-manual-page-for-binary.*")
+addFilter(".*world-writable.*/var/lib/texmf/ls-R.*")
+addFilter(".*world-writable.*/var/lib/texmf/db/ls-R.*")
+addFilter(".*world-writable.*/var/cache/fonts/ls-R.*")
+addFilter(".*world-writable.*/var/lib/texmf/.*/ls-R.*")
+addFilter(".*incorrect-fsf-address.*")
+addFilter(".*name-repeated-in-summary.*")
+addFilter(".*rpm-buildroot-usage.*")
+addFilter(".*binary-or-shlib-calls-gethostbyname.*")
+addFilter(".*invalid-license.*SUSE-TeX.*")
diff --git a/texlive.spec b/texlive.spec
index 4a5c524..b726b81 100644
--- a/texlive.spec
+++ b/texlive.spec
@@ -16,7 +16,7 @@
 #
 
 %define texlive_version 2012
-%define texlive_release 20120416
+%define texlive_release 0416
 %define texlive_source  texlive-20120416-source
 
 %define __perl_requires		%{nil}
@@ -65,6 +65,7 @@ BuildRequires:  freetype2-devel
 BuildRequires:  gc-devel
 BuildRequires:  gcc-c++
 BuildRequires:  gd-devel
+BuildConflicts: ghostscript-mini
 BuildRequires:  ghostscript-devel
 BuildRequires:  ghostscript-library
 BuildRequires:  glibc-devel
@@ -272,7 +273,8 @@ texconfig and has multilanguage options.
 Summary: Basic system layout for TeX Live
 Group: Productivity/Publishing/TeX/Base
 Url: http://www.tug.org/texlive/
-Requires(post,verify): permissions
+Requires(verify): permissions
+Requires(post): permissions
 BuildArch: noarch
 
 %description filesystem
@@ -3701,7 +3703,7 @@ The collection-pstricks package
 %package collection-publishers
 Version: %{texlive_version}
 Release: %{texlive_release}.svn25892.<CI_CNT>.<B_CNT>
-Summary: Support for publishers, theses, standards, conferences, etc
+Summary: Support for publishers, theses, standards, conferences, etcetera
 Group: Productivity/Publishing/TeX/Base
 Url: http://www.tug.org/texlive/
 Requires: texlive-ANUfinalexam = %{texlive_version}
@@ -5360,7 +5362,7 @@ separately, but rather is released and maintained as part of
 the TeX-live sources.
 
 %package -n libptexenc1
-License: BSD3c
+License: BSD-3-Clause
 Version: 1.2.0
 Release: <CI_CNT>.<B_CNT>
 Summary: Libraries of Kanji code convert library for pTeX
@@ -5374,7 +5376,7 @@ The ptexenc is a useful library for Japanese pTeX
 TeX by ASCII Co.) and its surrounding tools.
 
 %package -n %{name}-ptexenc-devel
-License: BSD3c
+License: BSD-3-Clause
 Version: 1.2.0
 Release: <CI_CNT>.<B_CNT>
 Summary: Libraries of Kanji code convert library for pTeX
@@ -13026,9 +13028,9 @@ TeX by ASCII Co.) and its surrounding tools.
 	%{_fontcache}/pk/		root:root	1755
 	%{_fontcache}/source/		root:root	1755
 	%{_fontcache}/tfm/		root:root	1755
-EOF
+	EOF
     while read path rest ; do
-echo $path
+	echo $path
     done < %{buildroot}%{_sysconfdir}/permissions.d/texlive > %{buildroot}/%{_texmfconfdir}/permlist
 
     # install manual page of nobody