From d7802035a7143353dbfefc51d769bdeb5a03929c Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Feb 03 2014 13:57:52 +0000 Subject: Merge branch 'master' into f20 --- diff --git a/.gitignore b/.gitignore index 6c7793d..4c97e89 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,9 @@ /kde-dev-scripts-4.11.1.tar.xz /kde-dev-scripts-4.11.2.tar.xz /kde-dev-scripts-4.11.3.tar.xz +/kde-dev-scripts-4.11.90.tar.xz +/kde-dev-scripts-4.11.95.tar.xz +/kde-dev-scripts-4.11.97.tar.xz +/kde-dev-scripts-4.12.0.tar.xz +/kde-dev-scripts-4.12.1.tar.xz +/kde-dev-scripts-4.12.2.tar.xz diff --git a/kde-dev-scripts.spec b/kde-dev-scripts.spec index cfa434b..427c2a3 100644 --- a/kde-dev-scripts.spec +++ b/kde-dev-scripts.spec @@ -1,6 +1,6 @@ Name: kde-dev-scripts Summary: KDE SDK scripts -Version: 4.11.3 +Version: 4.12.2 Release: 1%{?dist} License: GPLv2+ and GPLv2+ and BSD @@ -106,6 +106,7 @@ rm -f %{buildroot}%{_kde4_bindir}/krazy-licensecheck %{_kde4_bindir}/cvslastlog %{_kde4_bindir}/svnversions %{_kde4_bindir}/draw_lib_dependencies +%{_kde4_bindir}/reviewboard-am %{_mandir}/man1/adddebug.1.gz %{_mandir}/man1/cheatmake.1.gz %{_mandir}/man1/create_cvsignore.1.gz @@ -126,6 +127,24 @@ rm -f %{buildroot}%{_kde4_bindir}/krazy-licensecheck %{_mandir}/man1/zonetab2pot.py.1.gz %changelog +* Fri Jan 31 2014 Rex Dieter - 4.12.2-1 +- 4.12.2 + +* Fri Jan 10 2014 Rex Dieter - 4.12.1-1 +- 4.12.1 + +* Thu Dec 19 2013 Rex Dieter - 4.12.0-1 +- 4.12.0 + +* Sun Dec 01 2013 Rex Dieter - 4.11.97-1 +- 4.11.97 + +* Thu Nov 21 2013 Rex Dieter - 4.11.95-1 +- 4.11.95 + +* Sat Nov 16 2013 Rex Dieter - 4.11.90-1 +- 4.11.90 + * Sat Nov 02 2013 Rex Dieter - 4.11.3-1 - 4.11.3 diff --git a/sources b/sources index 6afe950..f31de00 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ad0bb78f589c17b15782960d5957c850 kde-dev-scripts-4.11.3.tar.xz +1dd9e2b54180d8c70e64b73a6ac02ae1 kde-dev-scripts-4.12.2.tar.xz