mizdebsk pushed to xpp2 (master). "Remove workarounds for RPM bug #646523"

[notifications at fedoraproject.org]

>From f9ff3d8052138f2cffc28870d4f48bccef5c0de4 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Wed, 25 Mar 2015 12:45:28 +0100
Subject: Remove workarounds for RPM bug #646523


diff --git a/xpp2.spec b/xpp2.spec
index 2617504..8c35207 100644
--- a/xpp2.spec
+++ b/xpp2.spec
@@ -33,7 +33,7 @@
 Summary:        XML Pull Parser
 Name:           xpp2
 Version:        2.1.10
-Release:        19%{?dist}
+Release:        20%{?dist}
 Epoch:          0
 License:        xpp and ASL 1.1 and Public Domain
 URL:            http://www.extreme.indiana.edu/xgws/xsoap/xpp/
@@ -112,16 +112,6 @@ rm -rf doc/{build.txt,api,api_impl}
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
 cp -pr src/java/samples/* $RPM_BUILD_ROOT%{_datadir}/%{name}
 
-%pretrans javadoc
-# workaround for rpm bug, can be removed in F-23
-[ -L %{_javadocdir}/%{name} ] && \
-rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
-
-%pretrans demo
-# workaround for rpm bug, can be removed in F-23
-[ -L %{_datadir}/%{name} ] && \
-rm -rf $(readlink -f %{_datadir}/%{name}) %{_datadir}/%{name} || :
-
 %files
 %doc LICENSE.txt README.html doc
 %{_javadir}/%{name}.jar
@@ -137,6 +127,9 @@ rm -rf $(readlink -f %{_datadir}/%{name}) %{_datadir}/%{name} || :
 %{_datadir}/%{name}
 
 %changelog
+* Wed Mar 25 2015 Mikolaj Izdebski <mizdebsk at redhat.com> - 0:2.1.10-20
+- Remove workarounds for RPM bug #646523
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:2.1.10-19
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/xpp2.git/commit/?h=master&id=f9ff3d8052138f2cffc28870d4f48bccef5c0de4

--
You received this message due to your preference settings at
https://apps.fedoraproject.org/notifications//fmnscmcommits.id.fedoraproject.org/email/29390