Accepting request 96836 from home:computersalat:devel:php

fix changelog for bnc#736772

OBS-URL: https://build.opensuse.org/request/show/96836
OBS-URL: https://build.opensuse.org/package/show/server:php:applications/phpMyAdmin?expand=0&rev=26

phpMyAdmin.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Dec 16 08:34:11 UTC 2011 - chris@computersalat.de
+
+- fix changelog
+  * add missing info for bnc#736772
+- fix fdupes
+  * reduce fdupes to affected files only (./libraries,./themes)
+
 -------------------------------------------------------------------
 Tue Dec 13 14:25:45 UTC 2011 - chris@computersalat.de
 
@@ -27,6 +35,7 @@ Tue Dec 13 14:25:45 UTC 2011 - chris@computersalat.de
   - [security] Self-XSS on column type (Create index), see PMASA-2011-18
   - [security] Self-XSS on column type (table Search), see PMASA-2011-18
   - [security] Self-XSS on invalid query (table overview), see PMASA-2011-18
+- fix for bnc#736772 (CVE-2011-4634, PMASA-2011-18)
 
 -------------------------------------------------------------------
 Mon Nov 14 20:22:30 UTC 2011 - chris@computersalat.de

phpMyAdmin.spec

@@ -16,6 +16,7 @@
 #
 
 
+
 Name:           phpMyAdmin
 
 %define apxs %{_sbindir}/apxs2
@@ -132,7 +133,8 @@ find $RPM_BUILD_ROOT%{ap_docroot}/%{name} -maxdepth 1 -type f | grep -v 'config.
 
 # rpmlint stuff
 %if 0%{?suse_version} > 1020
-%fdupes -s ${RPM_BUILD_ROOT}
+%fdupes ${RPM_BUILD_ROOT}%{ap_docroot}/%{name}/libraries
+%fdupes ${RPM_BUILD_ROOT}%{ap_docroot}/%{name}/themes
 %endif
 
 %post