Hello community,

here is the log from the commit of package kdesdk3 for openSUSE:Factory checked 
in at 2012-05-12 08:51:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kdesdk3 (Old)
 and      /work/SRC/openSUSE:Factory/.kdesdk3.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "kdesdk3", Maintainer is "[email protected]"

Changes:
--------
--- /work/SRC/openSUSE:Factory/kdesdk3/kdesdk3.changes  2012-03-29 
11:41:05.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.kdesdk3.new/kdesdk3.changes     2012-05-12 
08:51:32.000000000 +0200
@@ -1,0 +2,5 @@
+Fri May 11 19:21:57 UTC 2012 - [email protected]
+
+- drop custom gettext which does not build and use the system one
+
+-------------------------------------------------------------------

Old:
----
  gettext-0.10.35.diff
  gettext-0.10.35.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kdesdk3.spec ++++++
--- /var/tmp/diff_new_pack.CDNvnV/_old  2012-05-12 08:51:33.000000000 +0200
+++ /var/tmp/diff_new_pack.CDNvnV/_new  2012-05-12 08:51:33.000000000 +0200
@@ -13,8 +13,6 @@
 # published by the Open Source Initiative.
 
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
-#
-
 
 Name:           kdesdk3
 %define _mandir /opt/kde3/share/man
@@ -32,13 +30,10 @@
 Version:        3.5.10
 Release:        0
 Url:            http://www.kde.org/
-Requires:       kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' 
kdelibs3`)
 Requires:       cvs
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source0:        kdesdk-%{version}.tar.bz2
-Source1:        gettext-0.10.35.tar.bz2
 Patch0:         3_5_BRANCH.diff
-Patch1:         gettext-0.10.35.diff
 
 %description
 This is a collection of applications and tools used by KDE developers.
@@ -50,12 +45,6 @@
 
 * umbrello: UML modeller
 
-
-
-Authors:
---------
-    The KDE Team <[email protected]>
-
 %package kdecvs
 # usesubdirs kbugbuster
 Summary:        KBugBuster
@@ -65,12 +54,6 @@
 KBugBuster can be used by people with a KDE CVS account to handle bug
 reports.
 
-
-
-Authors:
---------
-    The KDE Team <[email protected]>
-
 %package profile
 # usesubdirs kcachegrind
 Summary:        Profiling Tools
@@ -82,17 +65,11 @@
 Valgrind. You can profile your application with Valgrind using Calltree
 skin and display the result in KCachegrind to easily find bottlenecks.
 
-
-
-Authors:
---------
-    The KDE Team <[email protected]>
-
 %package translate
 # usesubdirs kbabel poxml
 Summary:        Tools to Handle Translations
 Group:          System/GUI/KDE
-Requires:       gettext
+Requires:       gettext-tools
 
 %description translate
 KBabel: for easy handling of PO files. PO files are used to store
@@ -100,12 +77,6 @@
 
 poxml: translate DocBook files using translated PO files.
 
-
-
-Authors:
---------
-    The KDE Team <[email protected]>
-
 %package devel
 Requires:       kdesdk3 kdelibs3-devel
 Summary:        Include Files and Libraries mandatory for Development
@@ -115,35 +86,18 @@
 This package contains all necessary include files and libraries needed
 to develop applications that require these.
 
-
-
-Authors:
---------
-    The KDE Team <[email protected]>
-
 %prep
-%setup -q -n kdesdk-%{version} -b 1
+%setup -q -n kdesdk-%{version}
 %patch0
 # kmtrace does not work with glibc 2.3 anymore and valgrind is way better
 rm -rf kmtrace
 . /etc/opt/kde3/common_options
 update_admin
-cd ../gettext-0.10.35
-chmod 0644 src/*
-%patch1
-patch -p0 < ../kdesdk-%version/scripts/gettext.patch
 
 %build
 . /etc/opt/kde3/common_options
-./configure $configkde
+./configure $configkde --mandir=%_mandir
 do_make %{?jobs:-j %jobs}
-cd ../gettext-0.10.35
-rm -f missing mkinstalldirs ltconfig install-sh ltmain.sh libtool
-autoreconf -fi
-CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" ./configure
-make -C intl
-make -C lib
-make -C src xgettext
 
 %install
 . /etc/opt/kde3/common_options
@@ -170,7 +124,6 @@
 chmod 0755 %{buildroot}/opt/kde3/share/apps/kapptemplate/admin/cvs.sh
 chmod 0755 %{buildroot}/opt/kde3/share/apps/kapptemplate/admin/doxygen.sh
 
-install -m 755 ../gettext-0.10.35/src/xgettext 
$RPM_BUILD_ROOT/opt/kde3/bin/kde-xgettext
 %suse_update_desktop_file    kuiviewer      Development GUIDesigner
 %suse_update_desktop_file    umbrello       Development Design
 %suse_update_desktop_file    kbugbuster     Development Debugger
@@ -183,9 +136,6 @@
 kde_post_install
 %fdupes -s $RPM_BUILD_ROOT
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
@@ -318,7 +268,6 @@
 
 %files translate
 %defattr(-,root,root)
-/opt/kde3/bin/kde-xgettext
 /opt/kde3/bin/catalogmanager
 /opt/kde3/bin/kbabel*
 /opt/kde3/bin/po2xml

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to