rpms/kde-l10n/F-12 kde-l10n.spec,1.110,1.111
Rex Dieter
rdieter at fedoraproject.org
Fri Jul 9 16:59:33 UTC 2010
Author: rdieter
Update of /cvs/pkgs/rpms/kde-l10n/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv10084
Modified Files:
kde-l10n.spec
Log Message:
* Wed Jul 07 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.4.5-2
- kde-l10n-sr conflicts with (lib)ktorrent (#612314)
Index: kde-l10n.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-l10n/F-12/kde-l10n.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -p -r1.110 -r1.111
--- kde-l10n.spec 3 Jul 2010 16:12:47 -0000 1.110
+++ kde-l10n.spec 9 Jul 2010 16:59:33 -0000 1.111
@@ -3,7 +3,7 @@
Name: kde-l10n
Version: 4.4.5
-Release: 1%{dist}
+Release: 2%{dist}
Url: http://www.kde.org
Summary: Internationalization support for KDE
Group: User Interface/Desktops
@@ -836,12 +836,20 @@ Provides: %{name}-zh_TW = %{version}-%{r
%description Chinese-Traditional
Chinese (Traditional) language support for KDE
+
%prep
-%setup -q -n %{name}-%{version} -c
+%setup -T -n %{name}-%{version} -c
for i in $(cat %{SOURCE1000}) ; do
echo $i | grep -v '^#' && \
bzip2 -dc %{_sourcedir}/%{name}-$i-%{version}.tar.bz2 | tar -xf -
+
+ ## hack to remove extragear crud from kde-l10n-sr (#612314)
+ if [ "$i" == "sr" ]; then
+ rm -rfv %{name}-$i-%{version}/*/messages/extragear-network
+ sed -i -e 's/add_subdirectory(extragear-network)/#add_subdirectory(extragear-network)/g' %{name}-$i-%{version}/*/messages/CMakeLists.txt
+ fi
+
done
# upstream patches
@@ -1579,6 +1587,9 @@ rm -rf %{buildroot}
%changelog
+* Wed Jul 07 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.4.5-2
+- kde-l10n-sr conflicts with (lib)ktorrent (#612314)
+
* Tue Jun 29 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.4.5-1
- 4.4.5
More information about the scm-commits
mailing list