July 2008 - openSUSE Commits - openSUSE Mailing Lists

commit jakarta-commons-lang
by root＠Hilbert.suse.de 29 Jul '08

29 Jul '08

Hello community, here is the log from the commit of package jakarta-commons-lang checked in at Wed Jul 30 00:58:53 CEST 2008. -------- --- jakarta-commons-lang/jakarta-commons-lang.changes 2006-09-15 14:55:38.000000000 +0200 +++ /mounts/work_src_done/STABLE/jakarta-commons-lang/jakarta-commons-lang.changes 2008-07-29 09:11:11.000000000 +0200 @@ -1,0 +2,16 @@ +Tue Jul 29 09:09:19 CEST 2008 - anosek(a)suse.cz + +- made the symlink jakarta-commons-lang -> jakarta-commons-lang-2.3 + part of the javadoc package + +------------------------------------------------------------------- +Mon Jul 21 15:33:36 CEST 2008 - mvyskocil(a)suse.cz + +- update to 2.3 + - merged with japackage 1.7 spec file + - add a maven build support and a maven pom files and post/un scripts for + depmap files +- removed a source=1.1 - fixed build under openjdk6 +- removed a crosslink patch + +------------------------------------------------------------------- Old: ---- commons-lang-2.0-src.tar.gz jakarta-commons-lang-crosslink.patch New: ---- commons-lang-2.3-jpp-depmap.xml commons-lang-2.3.pom commons-lang-2.3-src.tar.bz2 pom-maven2jpp-depcat.xsl pom-maven2jpp-mapdeps.xsl pom-maven2jpp-newdepmap.xsl ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jakarta-commons-lang.spec ++++++ --- /var/tmp/diff_new_pack.N19695/_old 2008-07-30 00:58:30.000000000 +0200 +++ /var/tmp/diff_new_pack.N19695/_new 2008-07-30 00:58:30.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package jakarta-commons-lang (Version 2.0) +# spec file for package jakarta-commons-lang (Version 2.3) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -10,22 +10,43 @@ # norootforbuild -Name: jakarta-commons-lang -BuildRequires: ant java2-devel-packages junit xml-commons-apis +%define with_maven 0 %define base_name lang %define short_name commons-%{base_name} -%define name jakarta-%{short_name} %define section free -Version: 2.0 -Release: 25 + +Name: jakarta-commons-lang +Version: 2.3 +Release: 1 Summary: Jakarta Commons Lang Package -License: Apache +License: The Apache Software License Group: Development/Libraries/Java -URL: http://jakarta.apache.org/commons/lang.html -Source0: http://archive.apache.org/dist/jakarta/commons/lang/source/commons-lang-2.0… -Patch0: %{name}-crosslink.patch +Url: http://jakarta.apache.org/commons/lang.html +Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{vers… +Source1: pom-maven2jpp-depcat.xsl +Source2: pom-maven2jpp-newdepmap.xsl +Source3: pom-maven2jpp-mapdeps.xsl +Source4: %{short_name}-%{version}-jpp-depmap.xml +Source5: %{short_name}-%{version}.pom BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch +BuildRequires: jpackage-utils >= 1.7.2 +BuildRequires: ant +BuildRequires: ant-junit +BuildRequires: perl +BuildRequires: java-devel +BuildRequires: unzip +BuildRequires: saxon +BuildRequires: saxon-scripts +%if %{with_maven} +BuildRequires: maven >= 1.1 +BuildRequires: maven-plugin-changelog +BuildRequires: maven-plugin-changes +BuildRequires: maven-plugin-xdoc +%endif +PreReq: jpackage-utils >= 1.7.2 +Requires(post): jpackage-utils >= 1.7.2 +Requires(postun): jpackage-utils >= 1.7.2 %description The standard Java libraries fail to provide enough methods for @@ -41,6 +62,7 @@ %package javadoc +License: The Apache Software License PreReq: coreutils Summary: Javadoc for jakarta-commons-lang Group: Development/Libraries/Java @@ -61,63 +83,148 @@ +%if %{with_maven} + +%package manual + +Summary: Documents for %{name} +Group: Development/Documentation + +%description manual +The standard Java libraries fail to provide enough methods for +manipulation of its core classes. The Commons Lang Component provides +these extra methods. The Commons Lang Component provides a host of +helper utilities for the java.lang API, notably String manipulation +methods, basic numerical methods, object reflection, creation and +serialization, and System properties. Additionally it contains an +inheritable enum type, an exception structure that supports multiple +types of nested-Exceptions and a series of utlities dedicated to help +with building methods, such as hashCode, toString and equals. + +This package contains the documentation for the Jakarta Commons +Lang Package. +%endif + %prep %setup -q -n %{short_name}-%{version}-src -%patch0 -p0 +%{__perl} -pi -e 's/\r//g' *.txt +if [ ! -f %{SOURCE4} ]; then +export DEPCAT=$(pwd)/%{short_name}-%{version}-depcat.new.xml +echo '<?xml version="1.0" standalone="yes"?>' > $DEPCAT +echo '<depset>' >> $DEPCAT +for p in $(find . -name project.xml); do + pushd $(dirname $p) + /usr/bin/saxon project.xml %{SOURCE1} >> $DEPCAT + popd +done +echo >> $DEPCAT +echo '</depset>' >> $DEPCAT +/usr/bin/saxon $DEPCAT %{SOURCE2} > %{short_name}-%{version}-depmap.new.xml +fi %build -if ! grep -q "javac.*source=" build.xml ; then - perl -p -i -e 's|<javac |<javac source=\"1.1\" |' build.xml - perl -p -i -e 's|<javadoc |<javadoc source=\"1.4\" |' build.xml -fi -ant \ +%if %{with_maven} +for p in $(find . -name project.xml); do + pushd $(dirname $p) + cp project.xml project.xml.orig + /usr/bin/saxon -o project.xml project.xml.orig %{SOURCE3} map=%{SOURCE4} + popd +done +maven \ + -Dmaven.javadoc.source=1.4 \ + -Dmaven.repo.remote=file:/usr/share/maven/repository \ + -Dmaven.home.local=$(pwd)/.maven \ + jar javadoc xdoc:transform +%else + ant \ -Djunit.jar=$(find-jar junit) \ -Dfinal.name=%{short_name} \ - -Dj2se.javadoc=%{_javadocdir}/java \ - dist + -Djdk.javadoc=%{_javadocdir}/java \ + jar javadoc +%endif %install # jars mkdir -p $RPM_BUILD_ROOT%{_javadir} +%if %{with_maven} +cp -p target/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar +%else cp -p dist/%{short_name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar +%endif (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|jakarta-||g"`; done) (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) +%add_to_maven_depmap %{base_name} %{base_name} %{version} JPP %{name} +# pom +install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms +install -m 644 %{SOURCE5} \ + $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom # javadoc mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink +ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} +## manual +install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} +cp -p STATUS.html $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} +cp -p *.txt $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} +%if %{with_maven} +rm -rf target/docs/apidocs +install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/site +cp -pr target/docs/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/site +%endif %clean rm -rf $RPM_BUILD_ROOT -%post javadoc -rm -f %{_javadocdir}/%{name} -ln -s %{name}-%{version} %{_javadocdir}/%{name} +%post +%update_maven_depmap + +%postun +%update_maven_depmap %files %defattr(0644,root,root,0755) -%doc PROPOSAL.html STATUS.html LICENSE.txt RELEASE-NOTES.txt +%dir %{_docdir}/%{name}-%{version} +%doc %{_docdir}/%{name}-%{version}/STATUS.html +%doc %{_docdir}/%{name}-%{version}/*.txt %{_javadir}/* +%{_datadir}/maven2 +%{_mavendepmapfragdir} %files javadoc %defattr(0644,root,root,0755) %doc %{_javadocdir}/%{name}-%{version} -%ghost %doc %{_javadocdir}/%{name} +%doc %{_javadocdir}/%{name} +%if %{with_maven} + +%files manual +%defattr(0644,root,root,0755) +%doc %{_docdir}/%{name}-%{version}/site +%endif -%changelog -n jakarta-commons-lang -* Fri Sep 15 2006 - ro(a)suse.de +%changelog +* Tue Jul 29 2008 anosek(a)suse.cz +- made the symlink jakarta-commons-lang -> jakarta-commons-lang-2.3 + part of the javadoc package +* Mon Jul 21 2008 mvyskocil(a)suse.cz +- update to 2.3 + - merged with japackage 1.7 spec file + - add a maven build support and a maven pom files and post/un scripts for + depmap files +- removed a source=1.1 - fixed build under openjdk6 +- removed a crosslink patch +* Fri Sep 15 2006 ro(a)suse.de - use source=1.1 for java -* Wed Jan 25 2006 - mls(a)suse.de +* Wed Jan 25 2006 mls(a)suse.de - converted neededforbuild to BuildRequires -* Mon Aug 29 2005 - jsmeix(a)suse.de +* Mon Aug 29 2005 jsmeix(a)suse.de - Removed the "test" to be built so that it builds now on all architectures (see bug 102629). The "test" failed on ppc, s390x, and ppc64 (see bug 113779). -* Wed Jul 27 2005 - jsmeix(a)suse.de +* Wed Jul 27 2005 jsmeix(a)suse.de - Adjustments in the spec file. -* Mon Jul 18 2005 - jsmeix(a)suse.de +* Mon Jul 18 2005 jsmeix(a)suse.de - Current version 2.0 from JPackage.org -* Thu Sep 16 2004 - skh(a)suse.de +* Thu Sep 16 2004 skh(a)suse.de - Fix prerequires of javadoc subpackage -* Thu Sep 02 2004 - skh(a)suse.de +* Thu Sep 02 2004 skh(a)suse.de - Initial package created with version 2.0 (JPackage 1.5) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit jakarta-commons-dbcp
by root＠Hilbert.suse.de 29 Jul '08

29 Jul '08

Hello community, here is the log from the commit of package jakarta-commons-dbcp checked in at Wed Jul 30 00:58:22 CEST 2008. -------- --- jakarta-commons-dbcp/jakarta-commons-dbcp.changes 2008-04-09 09:46:20.000000000 +0200 +++ /mounts/work_src_done/STABLE/jakarta-commons-dbcp/jakarta-commons-dbcp.changes 2008-07-29 09:10:59.000000000 +0200 @@ -1,0 +2,18 @@ +Tue Jul 29 09:03:46 CEST 2008 - anosek(a)suse.cz + +- made the symlink jakarta-commons-dbcp -> jakarta-commons-dbcp-1.2.2 + part of the javadoc package + +------------------------------------------------------------------- +Mon Jul 21 13:04:46 CEST 2008 - mvyskocil(a)suse.cz + +- merged with jpackage 1.7 spec + - added a tomcat5 subpackage (to fix [bnc#408253]) + - added a maven build branch (n/a in suse yet): + - added a poms and project.xmls for maven + - added a depmagfrags for maven +- build againts tomcat6 (instead of tomcat5 as in original jpackage project) +- add a java6 compatibility patch + + +------------------------------------------------------------------- New: ---- commons-build.tar.bz2 commons-dbcp-1.2.2.pom commons-dbcp-1.2.2-project_xml.patch dbcp-1.2.2-jpp-depmap.xml dbcp-tomcat5-build.xml java6-compatibility.patch pom-maven2jpp-depcat.xsl pom-maven2jpp-mapdeps.xsl pom-maven2jpp-newdepmap.xsl ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jakarta-commons-dbcp.spec ++++++ --- /var/tmp/diff_new_pack.T17711/_old 2008-07-30 00:58:00.000000000 +0200 +++ /var/tmp/diff_new_pack.T17711/_new 2008-07-30 00:58:00.000000000 +0200 @@ -11,30 +11,66 @@ # norootforbuild # icecream 0 - -Name: jakarta-commons-dbcp -BuildRequires: ant jakarta-commons-collections jakarta-commons-pool java-devel junit xml-commons-apis +%define with_maven 0 %define base_name dbcp %define short_name commons-%{base_name} -%define name jakarta-%{short_name} -%define version 1.2.2 -%define release 3jpp -%define section devel +%define section free + +Name: jakarta-commons-dbcp Version: 1.2.2 -Release: 1 +Release: 52 Summary: Jakarta Commons DataBase Pooling Package License: The Apache Software License Group: Development/Libraries/Java -Source0: %{short_name}-%{version}-src.tar.bz2 +Source0: http://www.apache.org/dist/commons/dbcp/source/commons-dbcp-1.2.2-src.tar.b… +Source1: pom-maven2jpp-depcat.xsl +Source2: pom-maven2jpp-newdepmap.xsl +Source3: pom-maven2jpp-mapdeps.xsl +Source4: %{base_name}-%{version}-jpp-depmap.xml +Source5: commons-build.tar.bz2 +Source6: dbcp-tomcat5-build.xml +Source7: commons-dbcp-1.2.2.pom +Patch0: commons-dbcp-1.2.2-project_xml.patch +#improved from https://issues.apache.org/jira/browse/DBCP-191 +Patch1: java6-compatibility.patch Url: http://jakarta.apache.org/commons/dbcp/ -PreReq: /usr/sbin/update-alternatives -Requires: jakarta-commons-collections >= 2.0 -Requires: jakarta-commons-pool >= 1.1 +BuildRequires: ant >= 1.6.5 +BuildRequires: jpackage-utils > 1.7.2 +BuildRequires: jakarta-commons-pool >= 1.3 +BuildRequires: jakarta-commons-logging +BuildRequires: jdbc-stdext >= 2.0 +BuildRequires: xerces-j2 +BuildRequires: junit >= 3.8.1 +BuildRequires: jakarta-commons-pool-tomcat5 +BuildRequires: jakarta-commons-collections-tomcat5 +BuildRequires: tomcat6-lib +BuildRequires: java-devel +%if %{with_maven} +BuildRequires: maven >= 1.1 +BuildRequires: maven-plugins-base +BuildRequires: maven-plugin-artifact +BuildRequires: maven-plugin-checkstyle +BuildRequires: sf-cobertura-maven-plugin +BuildRequires: sf-findbugs-maven-plugin +BuildRequires: maven-plugin-pmd +BuildRequires: maven-plugin-xdoc +BuildRequires: maven-plugin-test +BuildRequires: maven-plugin-license +BuildRequires: maven-plugin-changes +BuildRequires: saxon +BuildRequires: saxon-scripts +%endif +Requires(post): /usr/sbin/update-alternatives +Requires(preun): /usr/sbin/update-alternatives +Requires: jakarta-commons-collections >= 3.2 +Requires: jakarta-commons-pool >= 1.3 BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: %{short_name} Provides: hibernate_jdbc_cache Obsoletes: %{short_name} +Requires(post): jpackage-utils >= 1.7.2 +Requires(postun): jpackage-utils >= 1.7.2 %description The DBCP package creates and maintains a database connection pool @@ -49,9 +85,10 @@ %package javadoc License: The Apache Software License -PreReq: coreutils Summary: Javadoc for jakarta-commons-dbcp Group: Development/Libraries/Java +Requires(post): /bin/rm,/bin/ln +Requires(postun): /bin/rm %description javadoc This package contains the javadoc documentation for the DBCP package. @@ -66,27 +103,128 @@ +%package tomcat5 +License: The Apache Software License +Summary: Jakarta Commons DataBase Pooling Package +Group: Development/Libraries/Java + +%description tomcat5 +The DBCP package creates and maintains a database connection pool +package written in the Java language to be distributed under the ASF +license. The package is available as a pseudo-JDBC driver and via a +DataSource interface. The package also supports multiple logins to +multiple database systems, reclamation of stale or dead connections, +testing for valid connections, PreparedStatement pooling, and other +features. + + + +%if %{with_maven} + +%package manual + +Summary: Documents for %{name} +Group: Development/Documentation + +%description manual +This package contains the documentation for the DBCP package. + +The DBCP package shall create and maintain a database connection pool +package written in the Java language to be distributed under the ASF +license. The package shall be available as a pseudo-JDBC driver and via +a DataSource interface. The package shall also support multiple logins +to multiple database systems, reclamation of stale or dead connections, +testing for valid connections, PreparedStatement pooling, and other +features. +%endif + %prep %setup -q -n %{short_name}-%{version}-src # quick hack cp LICENSE.txt ../LICENSE # remove all binary libs find . -name "*.jar" -exec rm -f {} \; +bzip2 -dc %{SOURCE5} | tar xf - +cp %{SOURCE6} . +%patch0 -b .sav +%patch1 -b .sav1 +if [ ! -f %{SOURCE4} ]; then + export DEPCAT=$(pwd)/%{base_name}-%{version}-depcat.new.xml + echo '<?xml version="1.0" standalone="yes"?>' > $DEPCAT + echo '<depset>' >> $DEPCAT + for p in $(find . -name project.xml); do + pushd $(dirname $p) + /usr/bin/saxon project.xml %{SOURCE1} >> $DEPCAT + popd + done + echo >> $DEPCAT + echo '</depset>' >> $DEPCAT + /usr/bin/saxon $DEPCAT %{SOURCE2} > %{base_name}-%{version}-depmap.new.xml +fi %build -#export CLASSPATH=$(build-classpath commons-collections commons-pool jdbc-stdext junit) -export CLASSPATH=$(build-classpath commons-collections commons-pool junit) -ant -Djava.io.tmpdir=. dist +%if %{with_maven} +for p in $(find . -name project.xml); do + pushd $(dirname $p) + cp project.xml project.xml.orig + /usr/bin/saxon -o project.xml project.xml.orig %{SOURCE3} map=%{SOURCE4} + popd +done +mkdir -p .maven/repository/JPP/jars +pushd .maven/repository/JPP/jars + ln -sf $(build-classpath jdbc-stdext) jdbc.jar +popd +maven \ + -Dmaven.repo.remote=file:/usr/share/maven/repository \ + -Dmaven.home.local=$(pwd)/.maven \ + jar javadoc xdoc:transform +%else +ant \ + -Dcommons-pool.jar=$(build-classpath commons-pool) \ + -Djdbc20ext.jar=$(build-classpath jdbc-stdext) \ + -Djunit.jar=$(build-classpath junit) \ + -Dxerces.jar=$(build-classpath xerces-j2) \ + -Dxml-apis.jar=$(build-classpath xml-commons-jaxp-1.3-apis) \ + -Dnaming-common.jar=$(build-classpath tomcat6/catalina) \ + -Dnaming-java.jar=$(build-classpath tomcat6/catalina) \ + -Dlogging.jar=$(build-classpath commons-logging) \ + -Djava.io.tmpdir=. \ + dist test +%endif +export CLASSPATH=$(build-classpath jdbc-stdext xerces-j2 commons-collections-tomcat5 commons-pool-tomcat5) +ant -f dbcp-tomcat5-build.xml %install # jars install -d -m 755 $RPM_BUILD_ROOT%{_javadir} +%if %{with_maven} +install -m 644 target/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar +%else install -m 644 dist/%{short_name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar +%endif +#tomcat5 jars +install -m 644 dbcp-tomcat5/%{short_name}-tomcat5.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-tomcat5-%{version}.jar (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|jakarta-||g"`; done) (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) +%add_to_maven_depmap commons-dbcp commons-dbcp %{version} JPP %{name} +# pom +install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms +install -pm 644 %{SOURCE7} \ + $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom # javadoc install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} +%if %{with_maven} +cp -pr target/docs/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} +rm -rf target/docs/apidocs +%else cp -pr dist/docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} +%endif +ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} +%if %{with_maven} +# manual +install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} +cp -pr target/docs/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} +%endif # quick hack clean up rm ../LICENSE # hibernate_jdbc_cache ghost symlink @@ -99,6 +237,10 @@ %post update-alternatives --install %{_javadir}/hibernate_jdbc_cache.jar \ hibernate_jdbc_cache %{_javadir}/%{name}.jar 60 +%update_maven_depmap + +%postun +%update_maven_depmap %preun { @@ -109,14 +251,41 @@ %files %defattr(-,root,root) %doc LICENSE.txt -%{_javadir}/* +%{_javadir}/%{name}.jar +%{_javadir}/%{name}-%{version}.jar +%{_javadir}/%{short_name}.jar +%{_javadir}/%{short_name}-%{version}.jar %ghost %{_javadir}/hibernate_jdbc_cache.jar +%{_datadir}/maven2 +%{_mavendepmapfragdir} + +%files tomcat5 +%defattr(-,root,root) +%{_javadir}/*-tomcat5*.jar %files javadoc %defattr(-,root,root) -%{_javadocdir}/%{name}-%{version} +%doc %{_javadocdir}/%{name}-%{version} +%doc %{_javadocdir}/%{name} +%if %{with_maven} + +%files manual +%defattr(0644,root,root,0755) +%doc %{_docdir}/%{name}-%{version} +%endif %changelog +* Tue Jul 29 2008 anosek(a)suse.cz +- made the symlink jakarta-commons-dbcp -> jakarta-commons-dbcp-1.2.2 + part of the javadoc package +* Mon Jul 21 2008 mvyskocil(a)suse.cz +- merged with jpackage 1.7 spec + - added a tomcat5 subpackage (to fix [bnc#408253]) + - added a maven build branch (n/a in suse yet): + - added a poms and project.xmls for maven + - added a depmagfrags for maven +- build againts tomcat6 (instead of tomcat5 as in original jpackage project) +- add a java6 compatibility patch * Wed Apr 09 2008 mvyskocil(a)suse.cz - update to 1.2.2 - remove the java14compat patch ++++++ commons-dbcp-1.2.2-project_xml.patch ++++++ --- project.xml.sav 2007-08-28 16:19:16.000000000 +0200 +++ project.xml 2007-08-28 16:20:45.000000000 +0200 @@ -193,6 +193,24 @@ </properties> </dependency> + <dependency> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + <version>2.8.0</version> + <properties> + <scope>test</scope> + </properties> + </dependency> + + <dependency> + <groupId>xerces</groupId> + <artifactId>xml-apis</artifactId> + <version>1.3.03</version> + <properties> + <scope>test</scope> + </properties> + </dependency> +  <dependency> <groupId>tomcat</groupId> ++++++ java6-compatibility.patch ++++++ ++++ 1952 lines (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdebase4-session
by root＠Hilbert.suse.de 29 Jul '08

29 Jul '08

Hello community, here is the log from the commit of package kdebase4-session checked in at Wed Jul 30 00:55:56 CEST 2008. -------- --- KDE/kdebase4-session/kdebase4-session.changes 2008-07-14 14:42:33.000000000 +0200 +++ kdebase4-session/kdebase4-session.changes 2008-07-23 14:13:56.000000000 +0200 @@ -1,0 +2,10 @@ +Wed Jul 23 14:13:45 CEST 2008 - dmueller(a)suse.de + +- fix requires + +------------------------------------------------------------------- +Wed Jul 23 13:39:10 CEST 2008 - stbinner(a)suse.de + +- update version to 4.1.0 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-session.spec ++++++ --- /var/tmp/diff_new_pack.MR9305/_old 2008-07-30 00:53:10.000000000 +0200 +++ /var/tmp/diff_new_pack.MR9305/_new 2008-07-30 00:53:10.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdebase4-session (Version 4.0.98) +# spec file for package kdebase4-session (Version 4.1.0) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -15,12 +15,13 @@ Group: System/GUI/KDE Summary: The KDE Session Url: http://www.kde.org/ -Version: 4.0.98 +Version: 4.1.0 Release: 1 Source1: kde4.desktop Source2: COPYING BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: kdebase4 +BuildRequires: kde4-filesystem +Requires: kdebase4-workspace = %_kde_platform_version %description This package contains the startup scripts necessary to start a KDE @@ -52,6 +53,10 @@ /usr/share/doc/packages/kdebase4-session/COPYING %changelog +* Wed Jul 23 2008 dmueller(a)suse.de +- fix requires +* Wed Jul 23 2008 stbinner(a)suse.de +- update version to 4.1.0 * Mon Jul 14 2008 dmueller(a)suse.de - remove unconditional path manipulation (bnc#406102) * Fri Jul 11 2008 stbinner(a)suse.de ++++++ kde4.desktop ++++++ --- KDE/kdebase4-session/kde4.desktop 2008-07-14 14:41:48.000000000 +0200 +++ kdebase4-session/kde4.desktop 2008-07-23 13:39:42.000000000 +0200 @@ -3,4 +3,4 @@ Type=XSession Exec=/usr/bin/startkde TryExec=/usr/bin/startkde -Name=KDE 4.1 RC1 +Name=KDE 4.1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdebase4-runtime
by root＠Hilbert.suse.de 29 Jul '08

29 Jul '08

Hello community, here is the log from the commit of package kdebase4-runtime checked in at Wed Jul 30 00:52:58 CEST 2008. -------- --- KDE/kdebase4-runtime/kdebase4-runtime.changes 2008-07-18 13:12:19.000000000 +0200 +++ kdebase4-runtime/kdebase4-runtime.changes 2008-07-28 23:24:36.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Jul 25 16:11:30 CEST 2008 - dmueller(a)suse.de + +- update to 4.1.0 +- fix phonon-backend version + +------------------------------------------------------------------- oxygen-icon-theme.changes: same change Old: ---- kdebase-runtime-4.0.99.tar.bz2 New: ---- kdebase-runtime-4.1.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-runtime.spec ++++++ --- /var/tmp/diff_new_pack.lZ1247/_old 2008-07-30 00:49:11.000000000 +0200 +++ /var/tmp/diff_new_pack.lZ1247/_new 2008-07-30 00:49:11.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdebase4-runtime (Version 4.0.99) +# spec file for package kdebase4-runtime (Version 4.1.0) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -22,7 +22,7 @@ Group: System/GUI/KDE Summary: The KDE Runtime Components Url: http://www.kde.org/ -Version: 4.0.99 +Version: 4.1.0 Release: 1 Source0: kdebase-runtime-%version.tar.bz2 Source1: kde4-essential.menu @@ -55,7 +55,7 @@ License: LGPL v2.0 or later Summary: Phonon Multimedia Platform Abstraction Group: Development/Libraries/KDE -Provides: phonon-backend = %version +Provides: phonon-backend = %(rpm -q --queryformat '%{VERSION}' phonon) %description -n phonon-backend-xine Phonon is a cross-platform portable Multimedia Support Abstraction, @@ -359,6 +359,9 @@ %_kde4_modules/kcm_phononxine.so %changelog +* Fri Jul 25 2008 dmueller(a)suse.de +- update to 4.1.0 +- fix phonon-backend version * Fri Jul 18 2008 dmueller(a)suse.de - update to 4.0.99 * Thu Jul 10 2008 dmueller(a)suse.de ++++++ oxygen-icon-theme.spec ++++++ --- /var/tmp/diff_new_pack.lZ1247/_old 2008-07-30 00:49:11.000000000 +0200 +++ /var/tmp/diff_new_pack.lZ1247/_new 2008-07-30 00:49:11.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package oxygen-icon-theme (Version 4.0.99) +# spec file for package oxygen-icon-theme (Version 4.1.0) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -19,7 +19,7 @@ Group: System/GUI/KDE Summary: Oxygen Icon Theme Url: http://www.kde.org -Version: 4.0.99 +Version: 4.1.0 Release: 1 Requires: hicolor-icon-theme Recommends: oxygen-icon-theme-scalable @@ -117,6 +117,9 @@ /usr/share/icons/oxygen %changelog +* Fri Jul 25 2008 dmueller(a)suse.de +- update to 4.1.0 +- fix phonon-backend version * Fri Jul 18 2008 dmueller(a)suse.de - update to 4.0.99 * Thu Jul 10 2008 dmueller(a)suse.de ++++++ kdebase-runtime-4.0.99.tar.bz2 -> kdebase-runtime-4.1.0.tar.bz2 ++++++ KDE/kdebase4-runtime/kdebase-runtime-4.0.99.tar.bz2 kdebase4-runtime/kdebase-runtime-4.1.0.tar.bz2 differ: byte 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xalan-j2
by root＠Hilbert.suse.de 29 Jul '08

29 Jul '08

Hello community, here is the log from the commit of package xalan-j2 checked in at Wed Jul 30 00:46:15 CEST 2008. -------- --- xalan-j2/xalan-j2.changes 2008-07-21 17:40:10.000000000 +0200 +++ /mounts/work_src_done/STABLE/xalan-j2/xalan-j2.changes 2008-07-28 15:15:54.957865000 +0200 @@ -1,0 +2,10 @@ +Mon Jul 28 15:15:42 CEST 2008 - ro(a)suse.de + +- use xml-commons-apis-bootstrap instead of xml-commons-apis + +------------------------------------------------------------------- +Mon Jul 28 09:04:55 CEST 2008 - coolo(a)suse.de + +- buildignore xml-commons (ant works without it) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xalan-j2.spec ++++++ --- /var/tmp/diff_new_pack.F28923/_old 2008-07-30 00:46:01.000000000 +0200 +++ /var/tmp/diff_new_pack.F28923/_new 2008-07-30 00:46:01.000000000 +0200 @@ -13,14 +13,14 @@ Name: xalan-j2 -BuildRequires: ant bcel java_cup jlex servletapi5 xml-commons-apis +BuildRequires: ant bcel java_cup jlex servletapi5 xml-commons-apis-bootstrap BuildRequires: java-1_5_0-gcj-compat-devel xerces-j2-bootstrap -#!BuildIgnore: xerces-j2 +#!BuildIgnore: xerces-j2 xml-commons xml-commons-resolver xml-commons-apis %define section free %define version 2.7.0 %define cvs_version 2_7_0 Version: 2.7.0 -Release: 207 +Release: 217 Summary: Java XSLT processor License: The Apache Software License Source0: http://www.apache.org/dist/xml/xalan-j/source/xalan-j_%{cvs_version}-src.ta… @@ -240,6 +240,10 @@ %{_datadir}/%{name} %changelog +* Mon Jul 28 2008 ro(a)suse.de +- use xml-commons-apis-bootstrap instead of xml-commons-apis +* Mon Jul 28 2008 coolo(a)suse.de +- buildignore xml-commons (ant works without it) * Mon Jul 21 2008 coolo(a)suse.de - build against gcj to avoid bootstrap problems * Thu Sep 21 2006 skh(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit servletapi5
by root＠Hilbert.suse.de 29 Jul '08

29 Jul '08

Hello community, here is the log from the commit of package servletapi5 checked in at Wed Jul 30 00:45:53 CEST 2008. -------- --- servletapi5/servletapi5.changes 2008-07-28 09:08:58.000000000 +0200 +++ /mounts/work_src_done/STABLE/servletapi5/servletapi5.changes 2008-07-28 17:21:47.995191000 +0200 @@ -1,0 +2,5 @@ +Mon Jul 28 17:21:57 CEST 2008 - coolo(a)suse.de + +- yet another package to ignore + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ servletapi5.spec ++++++ --- /var/tmp/diff_new_pack.P28213/_old 2008-07-30 00:45:42.000000000 +0200 +++ /var/tmp/diff_new_pack.P28213/_new 2008-07-30 00:45:42.000000000 +0200 @@ -13,7 +13,7 @@ Name: servletapi5 BuildRequires: ant java-1_5_0-gcj-compat-devel xml-commons-apis-bootstrap -#!BuildIgnore: xml-commons xml-commons-resolver xerces-j2 +#!BuildIgnore: xml-commons xml-commons-resolver xerces-j2 xml-commons-apis %define base_name servletapi %define major_version 5 %define name %{base_name}%{major_version} @@ -22,7 +22,7 @@ %define release 1jpp %define section free Version: 5.0.18 -Release: 234 +Release: 238 Summary: Java servlet and JSP implementation classes License: The Apache Software License Group: Development/Libraries/Java @@ -127,6 +127,8 @@ %changelog * Mon Jul 28 2008 coolo(a)suse.de +- yet another package to ignore +* Mon Jul 28 2008 coolo(a)suse.de - build without openjdk to avoid cycle * Mon Sep 25 2006 dbornkessel(a)suse.de - java150 fixes: added target="1.4" and source="1.4" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit java-1_6_0-openjdk
by root＠Hilbert.suse.de 29 Jul '08

29 Jul '08

Hello community, here is the log from the commit of package java-1_6_0-openjdk checked in at Wed Jul 30 00:45:41 CEST 2008. -------- --- java-1_6_0-openjdk/java-1_6_0-openjdk.changes 2008-07-21 14:26:36.000000000 +0200 +++ /mounts/work_src_done/STABLE/java-1_6_0-openjdk/java-1_6_0-openjdk.changes 2008-07-29 00:07:41.000000000 +0200 @@ -1,0 +2,16 @@ +Tue Jul 29 00:07:05 CEST 2008 - ro(a)suse.de + +- fix build on i386 again (from gcc bug#36917) + +------------------------------------------------------------------- +Tue Jul 22 13:55:59 CEST 2008 - coolo(a)suse.de + +- build with xml-commons-api-bootstrap (ant complains, still works) + +------------------------------------------------------------------- +Tue Jul 22 11:01:05 CEST 2008 - coolo(a)suse.de + +- build with xerces-j2-bootstrap (misses jaxp_parser_impl, but + ant still works) + +------------------------------------------------------------------- New: ---- java-enum_cell.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ java-1_6_0-openjdk.spec ++++++ --- /var/tmp/diff_new_pack.K25625/_old 2008-07-30 00:45:10.000000000 +0200 +++ /var/tmp/diff_new_pack.K25625/_new 2008-07-30 00:45:10.000000000 +0200 @@ -21,7 +21,7 @@ %define icedteaver 1.2 %define openjdkver b09 Version: %{icedteaver}_%{openjdkver} -Release: 11 +Release: 15 Summary: Java runtime environment based on OpenJDK 6 and IcedTea 6 Group: Development/Libraries/Java License: GPL v2 only; - with the OpenJDK Assembly Exception and the GNU Classpath Exception @@ -45,6 +45,7 @@ Patch4: openjdk-6-src-b09-gcc4-warningfixes.patch Patch5: openjdk-6-src-b09-s390+s390x.patch Patch6: openjdk-6-src-b09-s390-size_t-fixes.patch +Patch7: java-enum_cell.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # Bootstrapping using gcj doesn't work in openSUSE so far, OpenJDK needs java-1.6: %define gcjbootstrap 0 @@ -77,7 +78,10 @@ # endif # These are just tools, they can be provided from any supported architecture. # ifarch any_running_arch -BuildRequires: ant fdupes gawk pkgconfig procps unzip wget xalan-j2 zip +BuildRequires: ant fdupes gawk pkg-config procps unzip wget xalan-j2 zip +# make sure to use bootstrap requires of ant +BuildRequires: xerces-j2-bootstrap +#!BuildIgnore: xerces-j2 xml-commons-resolver xml-commons-apis xml-commons # endif # These must be provided by from the target architecture for native build: #ifarch target_arch @@ -306,6 +310,7 @@ %ifarch s390 # Only needed on s390 for now, could break on other archictures in theory, for review: patch -l $* --input=%PATCH6 %endif + patch -l $* --input=%PATCH7 } %if %{gcjbootstrap} make patch-ecj; pushd openjdk-ecj; patch_openjdk -p1; popd @@ -744,6 +749,13 @@ %{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so %changelog +* Tue Jul 29 2008 ro(a)suse.de +- fix build on i386 again (from gcc bug#36917) +* Tue Jul 22 2008 coolo(a)suse.de +- build with xml-commons-api-bootstrap (ant complains, still works) +* Tue Jul 22 2008 coolo(a)suse.de +- build with xerces-j2-bootstrap (misses jaxp_parser_impl, but + ant still works) * Mon Jul 21 2008 coolo(a)suse.de - avoid buildcycle between xulrunner and openjdk * Thu Jul 17 2008 ro(a)suse.de ++++++ java-enum_cell.patch ++++++ --- openjdk/hotspot/src/share/vm/ci/ciTypeFlow.hpp 2008/07/28 22:04:10 1.1 +++ openjdk/hotspot/src/share/vm/ci/ciTypeFlow.hpp 2008/07/28 22:04:41 @@ -130,7 +130,7 @@ // Used as a combined index for locals and temps enum Cell { - Cell_0 + Cell_0, Cell_max = UINT_MAX }; // A StateVector summarizes the type information at some ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit java_cup
by root＠Hilbert.suse.de 29 Jul '08

29 Jul '08

Hello community, here is the log from the commit of package java_cup checked in at Wed Jul 30 00:45:33 CEST 2008. -------- --- java_cup/java_cup.changes 2008-07-25 07:44:48.000000000 +0200 +++ /mounts/work_src_done/STABLE/java_cup/java_cup.changes 2008-07-28 16:14:49.900089000 +0200 @@ -1,0 +2,10 @@ +Mon Jul 28 16:14:41 CEST 2008 - ro(a)suse.de + +- buildignore xml-commons-apis + +------------------------------------------------------------------- +Mon Jul 28 08:45:05 CEST 2008 - coolo(a)suse.de + +- buildignore the other cycle packages + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ java_cup.spec ++++++ --- /var/tmp/diff_new_pack.o21660/_old 2008-07-30 00:44:06.000000000 +0200 +++ /var/tmp/diff_new_pack.o21660/_new 2008-07-30 00:44:06.000000000 +0200 @@ -14,13 +14,14 @@ Name: java_cup BuildRequires: ant java-1_5_0-gcj-compat-devel xml-commons-apis-bootstrap +#!BuildIgnore: xml-commons xml-commons-resolver xerces-j2 xml-commons-apis %define name java_cup %define version 0.10 %define pkg_version v10k %define release 0.k.2jpp %define section free Version: 0.10 -Release: 224 +Release: 233 Summary: Java Source Interpreter License: BSD 3-Clause Url: http://www.cs.princeton.edu/%7Eappel/modern/java/CUP/ @@ -105,6 +106,10 @@ %ghost %doc %{_javadocdir}/%{name} %changelog +* Mon Jul 28 2008 ro(a)suse.de +- buildignore xml-commons-apis +* Mon Jul 28 2008 coolo(a)suse.de +- buildignore the other cycle packages * Fri Jul 25 2008 coolo(a)suse.de - build with gcj to avoid bootstrapping problems with openjdk * Mon Aug 20 2007 skh(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit installation-images
by root＠Hilbert.suse.de 29 Jul '08

29 Jul '08

Hello community, here is the log from the commit of package installation-images checked in at Wed Jul 30 00:38:48 CEST 2008. -------- --- installation-images/installation-images.changes 2008-07-29 10:46:57.000000000 +0200 +++ /mounts/work_src_done/STABLE/installation-images/installation-images.changes 2008-07-29 21:16:42.101991000 +0200 @@ -1,0 +2,10 @@ +Tue Jul 29 21:16:55 CEST 2008 - coolo(a)suse.de + +- libzypp needs more of boost now + +------------------------------------------------------------------- +Tue Jul 29 15:29:36 CEST 2008 - ro(a)suse.de + +- ignore sax* on s390x + +------------------------------------------------------------------- New: ---- installation-images-10.50.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ installation-images.spec ++++++ --- /var/tmp/diff_new_pack.Q26332/_old 2008-07-30 00:38:12.000000000 +0200 +++ /var/tmp/diff_new_pack.Q26332/_new 2008-07-30 00:38:12.000000000 +0200 @@ -16,7 +16,7 @@ BuildRequires: FZSongTi IPAGothic KhmerOS-fonts adaptec-firmware ash autoyast2-installation baekmuk-ttf bc blueprint-cursor-theme bootsplash bootsplash-branding-SLED bootsplash-branding-SLES bootsplash-branding-openSUSE cifs-mount cron cups-libs ddrescue dhcpcd dhcpv6 dmraid dump ed efont-unicode eject evms-gui fbiterm finger fonts-arabic fonts-config fonts-thai freefont gdb glibc-i18ndata hex icmpinfo indic-fonts initviocons iputils joe kdelibs3 krb5-devel libidn libjpeg-devel libpng-devel links linuxrc lklug lvm2 mdadm mingetty mtools multipath-tools nasm netcat netpbm nfs-utils nscd ntfsprogs openslp-server openssh pcmciautils pcre-devel popt-devel pothana2000 qlogic-firmware recode rsh rsync sbl screen setserial sg3_utils smartmontools socat sysconfig syslogd tcpd-devel telnet telnet-server termcap terminfo usbutils wget xfsdump BuildRequires: e2fsprogs ncurses-utils yast2-add-on yast2-kdump yast2-mouse yast2-ncurses-pkg yast2-network yast2-ntp-client yast2-qt yast2-qt-pkg yast2-repair yast2-runlevel yast2-slp yast2-trans-allpacks yast2-trans-stats yast2-tune yast2-update yast2-users BuildRequires: aaa_base audit-libs boost busybox checkmedia cryptsetup dejavu dmapi dosfstools ethtool evms fvwm2 gpm hfsutils icewm-lite kernel-binary-packages libelf0 libzypp open-iscsi openct pciutils pcsc-lite perl-HTML-Parser resmgr sqlite3 util-linux -BuildRequires: gpg2 jfsutils kexec-tools limal limal-perl perl-XML-Bare sax2 sax2-tools suse-build-key yast2-iscsi-client yast2-ncurses +BuildRequires: gpg2 jfsutils kexec-tools limal limal-perl perl-XML-Bare suse-build-key yast2-iscsi-client yast2-ncurses BuildRequires: Mesa tightvnc xkeyboard-config xmset xorg-x11 xorg-x11-Xnest xorg-x11-Xvfb xorg-x11-fonts xorg-x11-fonts-core xorg-x11-libICE xorg-x11-libSM xorg-x11-libX11 xorg-x11-libXau xorg-x11-libXdmcp xorg-x11-libXext xorg-x11-libXfixes xorg-x11-libXmu xorg-x11-libXp xorg-x11-libXpm xorg-x11-libXrender xorg-x11-libXt xorg-x11-libfontenc xorg-x11-libxcb xorg-x11-libxkbfile xorg-x11-server xterm BuildRequires: bzip2 cracklib cracklib-dict-full curl libcap libexpat1 libfuse2 libreiserfs libreiserfs-devel lzma module-init-tools nfs-client ntfs-3g parted procinfo procps psmisc satsolver-tools squashfs strace unfonts vim xntp yast2-devtools BuildRequires: bind-libs bind-utils lsscsi sdparm smp_utils @@ -32,7 +32,7 @@ %endif BuildRequires: ltrace %ifnarch s390 s390x -BuildRequires: fbset iprutils kbd sax2-ident xorg-x11-driver-input xorg-x11-driver-video yast2-x11 +BuildRequires: fbset iprutils kbd sax2 sax2-ident sax2-tools xorg-x11-driver-input xorg-x11-driver-video yast2-x11 %endif %ifarch ppc ppc64 BuildRequires: librtas lilo pdisk powerpc-utils @@ -125,8 +125,9 @@ AutoReqProv: off Summary: Installation Image Files Version: 10.50 -Release: 6 +Release: 8 Source: installation-images-10.50.tar.bz2 +Patch: installation-images-10.50.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %define _binary_payload w.ufdio @@ -138,6 +139,7 @@ %prep %setup +%patch0 -p1 %build # files go to CD1/boot/$boot_arch/ @@ -412,6 +414,10 @@ /CD1 %changelog +* Tue Jul 29 2008 coolo(a)suse.de +- libzypp needs more of boost now +* Tue Jul 29 2008 ro(a)suse.de +- ignore sax* on s390x * Tue Jul 29 2008 snwint(a)suse.de - fixed BuildRequires * Wed Jul 23 2008 snwint(a)suse.de ++++++ installation-images-10.50.diff ++++++ diff -ru installation-images-10.50.orig/data/root/root.file_list installation-images-10.50/data/root/root.file_list --- installation-images-10.50.orig/data/root/root.file_list 2008-07-23 12:37:21.000000000 +0200 +++ installation-images-10.50/data/root/root.file_list 2008-07-29 20:45:40.748231000 +0200 @@ -129,7 +129,7 @@ e restore_cfg etc/passwd etc/shadow etc/group if arch eq 'ia32' || arch eq 'x86_64' || arch eq 'ia64' - libsmbios-libs: + libsmbios2: /usr/lib*/libsmbios.so.* endif @@ -916,6 +916,7 @@ boost: /usr/lib*/libboost_filesystem.so.* + /usr/lib*/libboost_signals-mt.so.* libidn: /usr/lib*/libidn.so.* ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdebase4
by root＠Hilbert.suse.de 29 Jul '08

29 Jul '08

Hello community, here is the log from the commit of package kdebase4 checked in at Wed Jul 30 00:22:49 CEST 2008. -------- --- KDE/kdebase4/kdebase4.changes 2008-07-18 01:58:03.000000000 +0200 +++ kdebase4/kdebase4.changes 2008-07-23 13:20:05.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Jul 23 13:20:02 CEST 2008 - dmueller(a)suse.de + +- update to 4.1.0 + +------------------------------------------------------------------- Old: ---- kdebase-4.0.99.tar.bz2 New: ---- kdebase-4.1.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4.spec ++++++ --- /var/tmp/diff_new_pack.H25176/_old 2008-07-30 00:20:52.000000000 +0200 +++ /var/tmp/diff_new_pack.H25176/_new 2008-07-30 00:20:52.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdebase4 (Version 4.0.99) +# spec file for package kdebase4 (Version 4.1.0) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,7 +11,7 @@ Name: kdebase4 -BuildRequires: NetworkManager-devel bluez-libs libkde4-devel libqimageblitz-devel +BuildRequires: NetworkManager-devel bluez-libs kde4-webkitpart libkde4-devel libqimageblitz-devel libraw1394-devel BuildRequires: kdebase4-workspace-devel libsmbclient-devel libsoprano-devel libxklavier-devel xine-devel %if %suse_version > 1020 BuildRequires: fdupes libusb-devel @@ -25,7 +25,7 @@ Group: System/GUI/KDE Summary: The Base KDE Apps Url: http://www.kde.org/ -Version: 4.0.99 +Version: 4.1.0 Release: 1 Source0: kdebase-%version.tar.bz2 Source1: _upstream @@ -452,6 +452,8 @@ /usr/share/kde4/services/plasma-applet-folderview.desktop %changelog +* Wed Jul 23 2008 dmueller(a)suse.de +- update to 4.1.0 * Fri Jul 18 2008 dmueller(a)suse.de - update to 4.0.99 * Fri Jul 11 2008 dmueller(a)suse.de ++++++ kdebase-4.0.99.tar.bz2 -> kdebase-4.1.0.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-4.0.99/apps/CMakeLists.txt new/kdebase-4.1.0/apps/CMakeLists.txt --- old/kdebase-4.0.99/apps/CMakeLists.txt 2008-06-10 13:40:58.000000000 +0200 +++ new/kdebase-4.1.0/apps/CMakeLists.txt 2008-07-23 10:25:29.000000000 +0200 @@ -9,7 +9,6 @@ find_package(ZLIB REQUIRED) include (KDE4Defaults) include (MacroLibrary) -include(MacroOptionalAddSubdirectory) include(ConfigureChecks.cmake) configure_file (config-apps.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-apps.h ) Files old/kdebase-4.0.99/apps/doc/dolphin/index.cache.bz2 and new/kdebase-4.1.0/apps/doc/dolphin/index.cache.bz2 differ Files old/kdebase-4.0.99/apps/doc/kfind/index.cache.bz2 and new/kdebase-4.1.0/apps/doc/kfind/index.cache.bz2 differ Files old/kdebase-4.0.99/apps/doc/kinfocenter/devices/index.cache.bz2 and new/kdebase-4.1.0/apps/doc/kinfocenter/devices/index.cache.bz2 differ Files old/kdebase-4.0.99/apps/doc/kinfocenter/dma/index.cache.bz2 and new/kdebase-4.1.0/apps/doc/kinfocenter/dma/index.cache.bz2 differ Files old/kdebase-4.0.99/apps/doc/kinfocenter/index.cache.bz2 and new/kdebase-4.1.0/apps/doc/kinfocenter/index.cache.bz2 differ Files old/kdebase-4.0.99/apps/doc/kinfocenter/interrupts/index.cache.bz2 and new/kdebase-4.1.0/apps/doc/kinfocenter/interrupts/index.cache.bz2 differ Files old/kdebase-4.0.99/apps/doc/kinfocenter/ioports/index.cache.bz2 and new/kdebase-4.1.0/apps/doc/kinfocenter/ioports/index.cache.bz2 differ Files old/kdebase-4.0.99/apps/doc/kinfocenter/memory/index.cache.bz2 and new/kdebase-4.1.0/apps/doc/kinfocenter/memory/index.cache.bz2 differ Files old/kdebase-4.0.99/apps/doc/kinfocenter/nics/index.cache.bz2 and new/kdebase-4.1.0/apps/doc/kinfocenter/nics/index.cache.bz2 differ Files old/kdebase-4.0.99/apps/doc/kinfocenter/opengl/index.cache.bz2 and new/kdebase-4.1.0/apps/doc/kinfocenter/opengl/index.cache.bz2 differ Files old/kdebase-4.0.99/apps/doc/kinfocenter/partitions/index.cache.bz2 and new/kdebase-4.1.0/apps/doc/kinfocenter/partitions/index.cache.bz2 differ Files old/kdebase-4.0.99/apps/doc/kinfocenter/pci/index.cache.bz2 and new/kdebase-4.1.0/apps/doc/kinfocenter/pci/index.cache.bz2 differ Files old/kdebase-4.0.99/apps/doc/kinfocenter/pcmcia/index.cache.bz2 and new/kdebase-4.1.0/apps/doc/kinfocenter/pcmcia/index.cache.bz2 differ Files old/kdebase-4.0.99/apps/doc/kinfocenter/processor/index.cache.bz2 and new/kdebase-4.1.0/apps/doc/kinfocenter/processor/index.cache.bz2 differ Files old/kdebase-4.0.99/apps/doc/kinfocenter/protocols/index.cache.bz2 and new/kdebase-4.1.0/apps/doc/kinfocenter/protocols/index.cache.bz2 differ Files old/kdebase-4.0.99/apps/doc/kinfocenter/samba/index.cache.bz2 and new/kdebase-4.1.0/apps/doc/kinfocenter/samba/index.cache.bz2 differ Files old/kdebase-4.0.99/apps/doc/kinfocenter/scsi/index.cache.bz2 and new/kdebase-4.1.0/apps/doc/kinfocenter/scsi/index.cache.bz2 differ Files old/kdebase-4.0.99/apps/doc/kinfocenter/sound/index.cache.bz2 and new/kdebase-4.1.0/apps/doc/kinfocenter/sound/index.cache.bz2 differ Files old/kdebase-4.0.99/apps/doc/kinfocenter/usb/index.cache.bz2 and new/kdebase-4.1.0/apps/doc/kinfocenter/usb/index.cache.bz2 differ Files old/kdebase-4.0.99/apps/doc/kinfocenter/xserver/index.cache.bz2 and new/kdebase-4.1.0/apps/doc/kinfocenter/xserver/index.cache.bz2 differ Files old/kdebase-4.0.99/apps/doc/konqueror/index.cache.bz2 and new/kdebase-4.1.0/apps/doc/konqueror/index.cache.bz2 differ Files old/kdebase-4.0.99/apps/doc/konsole/index.cache.bz2 and new/kdebase-4.1.0/apps/doc/konsole/index.cache.bz2 differ Files old/kdebase-4.0.99/apps/doc/kwrite/index.cache.bz2 and new/kdebase-4.1.0/apps/doc/kwrite/index.cache.bz2 differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-4.0.99/apps/dolphin/src/dolphin.desktop new/kdebase-4.1.0/apps/dolphin/src/dolphin.desktop --- old/kdebase-4.0.99/apps/dolphin/src/dolphin.desktop 2008-07-15 21:49:08.000000000 +0200 +++ new/kdebase-4.1.0/apps/dolphin/src/dolphin.desktop 2008-07-23 10:25:28.000000000 +0200 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Dolphin Name[ar]=الدولفين +Name[fy]=Dolfyn Name[gu]=ડોલ્ફિન Name[hi]=डॉल्फ़िन Name[km]=ឌូហ្វីន diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-4.0.99/apps/dolphin/src/dolphinmainwindow.cpp new/kdebase-4.1.0/apps/dolphin/src/dolphinmainwindow.cpp --- old/kdebase-4.0.99/apps/dolphin/src/dolphinmainwindow.cpp 2008-07-03 07:05:16.000000000 +0200 +++ new/kdebase-4.1.0/apps/dolphin/src/dolphinmainwindow.cpp 2008-07-23 10:25:28.000000000 +0200 @@ -506,7 +506,7 @@ m_viewTab[m_tabIndex].secondaryView->show(); setActiveViewContainer(m_viewTab[m_tabIndex].secondaryView); - } else if (m_activeViewContainer == m_viewTab[m_tabIndex].primaryView) { + } else if (m_activeViewContainer == m_viewTab[m_tabIndex].secondaryView) { // remove secondary view m_viewTab[m_tabIndex].secondaryView->close(); m_viewTab[m_tabIndex].secondaryView->deleteLater(); @@ -514,7 +514,7 @@ setActiveViewContainer(m_viewTab[m_tabIndex].primaryView); } else { - // The secondary view is active, hence from a users point of view + // The primary view is active and should be closed, Hence from a users point of view // the content of the secondary view should be moved to the primary view. // From an implementation point of view it is more efficient to close // the primary view and exchange the internal pointers afterwards. @@ -1177,7 +1177,7 @@ { QAction* splitAction = actionCollection()->action("split_view"); if (m_viewTab[m_tabIndex].secondaryView != 0) { - if (m_activeViewContainer == m_viewTab[m_tabIndex].primaryView) { + if (m_activeViewContainer == m_viewTab[m_tabIndex].secondaryView) { splitAction->setText(i18nc("@action:intoolbar Close right view", "Close")); splitAction->setIcon(KIcon("view-right-close")); } else { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-4.0.99/apps/dolphin/src/dolphinpart.desktop new/kdebase-4.1.0/apps/dolphin/src/dolphinpart.desktop --- old/kdebase-4.0.99/apps/dolphin/src/dolphinpart.desktop 2008-07-15 21:49:08.000000000 +0200 +++ new/kdebase-4.1.0/apps/dolphin/src/dolphinpart.desktop 2008-07-23 10:25:29.000000000 +0200 @@ -15,7 +15,7 @@ Name[et]=Dolphini vaade Name[fi]=Dolphin Name[fr]=Vue de Dolphin -Name[fy]=Dolphin werjefte +Name[fy]=Dolfyn werjefte Name[ga]=Amharc Dolphin Name[gl]=Vista de Dolphin Name[gu]=ડોલ્ફિન દેખાવ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-4.0.99/apps/dolphin/src/dolphinviewcontainer.cpp new/kdebase-4.1.0/apps/dolphin/src/dolphinviewcontainer.cpp --- old/kdebase-4.0.99/apps/dolphin/src/dolphinviewcontainer.cpp 2008-05-29 13:18:42.000000000 +0200 +++ new/kdebase-4.1.0/apps/dolphin/src/dolphinviewcontainer.cpp 2008-07-23 10:25:29.000000000 +0200 @@ -35,8 +35,11 @@ #include <kiconeffect.h> #include <kio/netaccess.h> #include <kio/previewjob.h> +#include <kmenu.h> #include <kmimetyperesolver.h> +#include <knewmenu.h> #include <konqmimedata.h> +#include <konq_fileitemcapabilities.h> #include <konq_operations.h> #include <kurl.h> @@ -170,6 +173,11 @@ void DolphinViewContainer::setUrl(const KUrl& newUrl) { m_urlNavigator->setUrl(newUrl); + + // Temporary disable the 'File'->'Create New...' menu until + // the write permissions can be checked in a fast way at + // DolphinViewContainer::slotDirListerCompleted(). + m_mainWindow->newMenu()->menu()->setEnabled(false); } const KUrl& DolphinViewContainer::url() const @@ -229,6 +237,18 @@ updateStatusBar(); QTimer::singleShot(100, this, SLOT(restoreContentsPos())); + + // Enable the 'File'->'Create New...' menu only if the directory + // supports writing. + KMenu* createNew = m_mainWindow->newMenu()->menu(); + KFileItem item = m_dirLister->rootItem(); + if (item.isNull()) { + // it is unclear whether writing is supported + createNew->setEnabled(true); + } else { + KonqFileItemCapabilities capabilities(KFileItemList() << item); + createNew->setEnabled(capabilities.supportsWriting()); + } } void DolphinViewContainer::showItemInfo(const KFileItem& item) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-4.0.99/apps/dolphin/src/generalsettingspage.cpp new/kdebase-4.1.0/apps/dolphin/src/generalsettingspage.cpp --- old/kdebase-4.0.99/apps/dolphin/src/generalsettingspage.cpp 2008-04-10 11:30:01.000000000 +0200 +++ new/kdebase-4.1.0/apps/dolphin/src/generalsettingspage.cpp 2008-07-23 10:25:29.000000000 +0200 @@ -100,15 +100,16 @@ { GeneralSettings* settings = DolphinSettings::instance().generalSettings(); - KSharedConfig::Ptr konqConfig = KSharedConfig::openConfig("konquerorrc", KConfig::IncludeGlobals); - KConfigGroup trashConfig(konqConfig, "Trash"); - trashConfig.writeEntry("ConfirmTrash", m_confirmMoveToTrash->isChecked()); - trashConfig.writeEntry("ConfirmDelete", m_confirmDelete->isChecked()); - trashConfig.sync(); - - KConfigGroup kdeConfig(KGlobal::config(), "KDE"); - kdeConfig.writeEntry("ShowDeleteCommand", m_showDeleteCommand->isChecked()); - kdeConfig.sync(); + KSharedConfig::Ptr kioConfig = KSharedConfig::openConfig("kiorc", KConfig::NoGlobals); + KConfigGroup confirmationGroup(kioConfig, "Confirmations"); + confirmationGroup.writeEntry("ConfirmTrash", m_confirmMoveToTrash->isChecked()); + confirmationGroup.writeEntry("ConfirmDelete", m_confirmDelete->isChecked()); + confirmationGroup.sync(); + + KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig("kdeglobals", KConfig::NoGlobals); + KConfigGroup globalGroup(globalConfig, "KDE"); + globalGroup.writeEntry("ShowDeleteCommand", m_showDeleteCommand->isChecked()); + globalGroup.sync(); settings->setShowCopyMoveMenu(m_showCopyMoveMenu->isChecked()); settings->setBrowseThroughArchives(m_browseThroughArchives->isChecked()); @@ -127,13 +128,14 @@ void GeneralSettingsPage::loadSettings() { - KSharedConfig::Ptr konqConfig = KSharedConfig::openConfig("konquerorrc", KConfig::IncludeGlobals); - const KConfigGroup trashConfig(konqConfig, "Trash"); - m_confirmMoveToTrash->setChecked(trashConfig.readEntry("ConfirmTrash", false)); - m_confirmDelete->setChecked(trashConfig.readEntry("ConfirmDelete", true)); - - const KConfigGroup kdeConfig(KGlobal::config(), "KDE"); - m_showDeleteCommand->setChecked(kdeConfig.readEntry("ShowDeleteCommand", false)); + KSharedConfig::Ptr kioConfig = KSharedConfig::openConfig("kiorc", KConfig::IncludeGlobals); + const KConfigGroup confirmationGroup(kioConfig, "Confirmations"); + m_confirmMoveToTrash->setChecked(confirmationGroup.readEntry("ConfirmTrash", false)); + m_confirmDelete->setChecked(confirmationGroup.readEntry("ConfirmDelete", true)); + + KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig("kdeglobals", KConfig::NoGlobals); + KConfigGroup globalGroup(globalConfig, "KDE"); + m_showDeleteCommand->setChecked(globalGroup.readEntry("ShowDeleteCommand", false)); GeneralSettings* settings = DolphinSettings::instance().generalSettings(); m_showCopyMoveMenu->setChecked(settings->showCopyMoveMenu()); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-4.0.99/apps/dolphin/src/kcmdolphin.desktop new/kdebase-4.1.0/apps/dolphin/src/kcmdolphin.desktop --- old/kdebase-4.0.99/apps/dolphin/src/kcmdolphin.desktop 2008-07-15 21:49:08.000000000 +0200 +++ new/kdebase-4.1.0/apps/dolphin/src/kcmdolphin.desktop 2008-07-23 10:25:28.000000000 +0200 @@ -1,5 +1,6 @@ Name=Dolphin Name[ar]=الدولفين +Name[fy]=Dolfyn Name[gu]=ડોલ્ફિન Name[hi]=डॉल्फ़िन Name[km]=ឌូហ្វីន @@ -28,7 +29,7 @@ Comment[et]=See teenus võimaldab seadistada Dolphini vaateid. Comment[fi]=Tämä palvelu sallii Dolphinin näkymien muokkauksen. Comment[fr]=Ce service permet de configurer les vues de Dolphin -Comment[fy]=De tsjinst stiet it ynstellen fan de Dolphin werjefte ta. +Comment[fy]=De tsjinst stiet it ynstellen fan de Dolfynwerjefte ta. Comment[gl]=Este servizo permite configurar as vistas de Dolphin. Comment[gu]=આ સેવા ડોલ્ફિન દેખાવોનું રૂપરેખાંકન કરવા દેશે. Comment[hu]=Ez a szolgáltatás a Dolphin nézeteinek beállítását teszi lehetővé. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-4.0.99/apps/dolphin/src/ktooltip.cpp new/kdebase-4.1.0/apps/dolphin/src/ktooltip.cpp --- old/kdebase-4.0.99/apps/dolphin/src/ktooltip.cpp 2008-06-25 09:52:45.000000000 +0200 +++ new/kdebase-4.1.0/apps/dolphin/src/ktooltip.cpp 2008-07-23 10:25:28.000000000 +0200 @@ -39,6 +39,11 @@ #include "ktooltip_p.h" +// compile with XShape older than 1.0 +#ifndef ShapeInput +const int ShapeInput = 2; +#endif + class KToolTipItemPrivate { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-4.0.99/apps/dolphin/src/ktreeview.cpp new/kdebase-4.1.0/apps/dolphin/src/ktreeview.cpp --- old/kdebase-4.0.99/apps/dolphin/src/ktreeview.cpp 2008-05-15 20:37:12.000000000 +0200 +++ new/kdebase-4.1.0/apps/dolphin/src/ktreeview.cpp 2008-07-23 10:25:28.000000000 +0200 @@ -54,10 +54,6 @@ startScrollTimer, SLOT(start())); } -KTreeView::~KTreeView() -{ -} - void KTreeView::KTreeViewPrivate::startScrolling() { QModelIndex index; @@ -130,14 +126,18 @@ // ************************************************ KTreeView::KTreeView(QWidget *parent) : - QTreeView(parent), - d(new KTreeViewPrivate(this)) + QTreeView(parent), + d(new KTreeViewPrivate(this)) { if (KGlobalSettings::graphicEffectsLevel() >= KGlobalSettings::SimpleAnimationEffects) { setAutoHorizontalScroll(true); } } +KTreeView::~KTreeView() +{ +} + void KTreeView::setAutoHorizontalScroll(bool value) { d->autoHorizontalScroll = value; @@ -169,5 +169,12 @@ } } +void KTreeView::hideEvent(QHideEvent *event) +{ + d->startScrollTimer->stop(); + d->timeLine->stop(); + QTreeView::hideEvent(event); +} + #include "ktreeview.moc" #include "ktreeview_p.moc" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-4.0.99/apps/dolphin/src/ktreeview.h new/kdebase-4.1.0/apps/dolphin/src/ktreeview.h --- old/kdebase-4.0.99/apps/dolphin/src/ktreeview.h 2008-05-15 20:37:12.000000000 +0200 +++ new/kdebase-4.1.0/apps/dolphin/src/ktreeview.h 2008-07-23 10:25:28.000000000 +0200 @@ -37,6 +37,9 @@ virtual void setSelectionModel(QItemSelectionModel *selectionModel); virtual void scrollTo(const QModelIndex& index, ScrollHint hint = EnsureVisible); +protected: + virtual void hideEvent(QHideEvent *event); + private: class KTreeViewPrivate; KTreeViewPrivate *d; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-4.0.99/apps/dolphin/src/sidebartreeview.cpp new/kdebase-4.1.0/apps/dolphin/src/sidebartreeview.cpp --- old/kdebase-4.0.99/apps/dolphin/src/sidebartreeview.cpp 2008-05-07 11:05:20.000000000 +0200 +++ new/kdebase-4.1.0/apps/dolphin/src/sidebartreeview.cpp 2008-07-23 10:25:28.000000000 +0200 @@ -80,7 +80,7 @@ } } - return QTreeView::event(event); + return KTreeView::event(event); } void SidebarTreeView::startDrag(Qt::DropActions supportedActions) @@ -90,7 +90,7 @@ void SidebarTreeView::dragEnterEvent(QDragEnterEvent* event) { - QTreeView::dragEnterEvent(event); + KTreeView::dragEnterEvent(event); if (event->mimeData()->hasUrls()) { event->acceptProposedAction(); } @@ -98,13 +98,13 @@ void SidebarTreeView::dragLeaveEvent(QDragLeaveEvent* event) { - QTreeView::dragLeaveEvent(event); + KTreeView::dragLeaveEvent(event); setDirtyRegion(m_dropRect); } void SidebarTreeView::dragMoveEvent(QDragMoveEvent* event) { - QTreeView::dragMoveEvent(event); + KTreeView::dragMoveEvent(event); // TODO: remove this code when the issue #160611 is solved in Qt 4.4 const QModelIndex index = indexAt(event->pos()); @@ -122,7 +122,7 @@ { const KUrl::List urls = KUrl::List::fromMimeData(event->mimeData()); if (urls.isEmpty()) { - QTreeView::dropEvent(event); + KTreeView::dropEvent(event); } else { event->acceptProposedAction(); const QModelIndex index = indexAt(event->pos()); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-4.0.99/apps/kappfinder/apps/Internet/knews.desktop new/kdebase-4.1.0/apps/kappfinder/apps/Internet/knews.desktop --- old/kdebase-4.0.99/apps/kappfinder/apps/Internet/knews.desktop 2008-07-15 21:49:04.000000000 +0200 +++ new/kdebase-4.1.0/apps/kappfinder/apps/Internet/knews.desktop 2008-07-23 10:25:23.000000000 +0200 @@ -84,7 +84,7 @@ GenericName[ta]=யுஸ்நெட் செய்தி வாசிப்பான் GenericName[te]=యూజ్ నెట్ వార్తలను చదివే కార్యక్రమం GenericName[tg]=Барномаи ахборот -GenericName[th]=โปรแกรมอ่านข่าวของ Usenet +GenericName[th]=โปรแกรมอ่านข่าวผ่าน Usenet GenericName[tr]=Usenet Haber Okuyucu GenericName[uk]=Програма перегляду новин Usenet GenericName[uz]=Usenet yangiliklarini oʻqish dasturi diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-4.0.99/apps/kappfinder/apps/Internet/Pan.desktop new/kdebase-4.1.0/apps/kappfinder/apps/Internet/Pan.desktop --- old/kdebase-4.0.99/apps/kappfinder/apps/Internet/Pan.desktop 2008-07-15 21:49:04.000000000 +0200 +++ new/kdebase-4.1.0/apps/kappfinder/apps/Internet/Pan.desktop 2008-07-23 10:25:23.000000000 +0200 @@ -78,7 +78,7 @@ GenericName[ta]=யுஸ்நெட் செய்தி வாசிப்பான் GenericName[te]=యూజ్ నెట్ వార్తలను చదివే కార్యక్రమం GenericName[tg]=Барномаи ахборот -GenericName[th]=โปรแกรมอ่านข่าวของ Usenet +GenericName[th]=โปรแกรมอ่านข่าวผ่าน Usenet GenericName[tr]=Usenet Haber Okuyucu GenericName[uk]=Програма перегляду новин Usenet GenericName[uz]=Usenet yangiliklarini oʻqish dasturi diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-4.0.99/apps/kappfinder/apps/Multimedia/amsynth.desktop new/kdebase-4.1.0/apps/kappfinder/apps/Multimedia/amsynth.desktop --- old/kdebase-4.0.99/apps/kappfinder/apps/Multimedia/amsynth.desktop 2008-07-15 21:49:04.000000000 +0200 +++ new/kdebase-4.1.0/apps/kappfinder/apps/Multimedia/amsynth.desktop 2008-07-23 10:25:24.000000000 +0200 @@ -26,6 +26,7 @@ GenericName[ja]=レトロアナログ - モデリングソフトシンセ GenericName[kk]=Ретро аналогты - модельдеу бағдарлама синтезаторы GenericName[km]=អាណាឡូកខាងក្រោយ - ធ្វើគំរូតាម Softsynth +GenericName[ko]=Retro 아날로그 - 소프트 신디사이저 GenericName[ku]=Retro Analog - Modelkirina Softsynth GenericName[lv]=Retro analogs - imitē Softsynth GenericName[ml]=റിട്രോ അനലോഗ് - മോഡലിങ്ങ് സോഫ്റ്റ്സിന്ത് diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-4.0.99/apps/konqueror/settings/kio/lanbrowser.desktop new/kdebase-4.1.0/apps/konqueror/settings/kio/lanbrowser.desktop --- old/kdebase-4.0.99/apps/konqueror/settings/kio/lanbrowser.desktop 2008-07-15 21:49:07.000000000 +0200 +++ new/kdebase-4.1.0/apps/konqueror/settings/kio/lanbrowser.desktop 2008-07-23 10:25:28.000000000 +0200 @@ -103,6 +103,7 @@ Comment[gu]=ભાગીદારી કરેલ ફોલ્ડરો અને પ્રિન્ટરો માટે સ્થાનિક નેટવર્ક રૂપરેખાંકિત કરો Comment[hu]=A helyi hálózat böngészési jellemzői osztott mappák és nyomtatók elérésekor Comment[it]=Configura la navigazione della rete locale per le cartelle e le stampanti condivise +Comment[ja]=フォルダとプリンタを共有するためにローカルネットワーク参照を設定 Comment[km]=កំណត់រចនាសម្ព័ន្ធការរុករកបណ្ដាញមូលដ្ឋានសម្រាប់ថត និងម៉ាស៊ីនបោះពុម្ពដែលបានចែករំលែក Comment[ko]=공유 폴더와 프린터를 탐색하는 로컬 네트워크 설정하기 Comment[ku]=Tora herêmî ji bo gera torê, peldakên parvekirî û çaperan veava bike diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-4.0.99/apps/konqueror/src/konqmainwindow.cpp new/kdebase-4.1.0/apps/konqueror/src/konqmainwindow.cpp --- old/kdebase-4.0.99/apps/konqueror/src/konqmainwindow.cpp 2008-07-17 23:32:47.000000000 +0200 +++ new/kdebase-4.1.0/apps/konqueror/src/konqmainwindow.cpp 2008-07-23 10:25:27.000000000 +0200 @@ -4501,8 +4501,17 @@ // It has to be a KActionCollection instead of a KActionPtrList because we need // the actionStatusText signal... KActionCollection popupMenuCollection( (QWidget*)0 ); - popupMenuCollection.addAction( "go_back", m_paBack ); - popupMenuCollection.addAction( "go_forward", m_paForward ); + + // m_paBack is a submenu, for the toolbar & edit menu "back", + // but in the RMB we want a simple one-click back instead. + KAction* simpleBack = KStandardAction::back( this, SLOT(slotBack()), &popupMenuCollection ); + simpleBack->setEnabled( m_paBack->isEnabled() ); + popupMenuCollection.addAction( "go_back", simpleBack ); + + KAction* simpleForward = KStandardAction::forward( this, SLOT(slotForward()), &popupMenuCollection ); + simpleForward->setEnabled( m_paForward->isEnabled() ); + popupMenuCollection.addAction( "go_forward", simpleForward ); + popupMenuCollection.addAction( "go_up", m_paUp ); popupMenuCollection.addAction( "reload", m_paReload ); popupMenuCollection.addAction( "closedtabs", m_paClosedItems ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-4.0.99/apps/konqueror/src/konqnewsessiondlg_base.ui new/kdebase-4.1.0/apps/konqueror/src/konqnewsessiondlg_base.ui --- old/kdebase-4.0.99/apps/konqueror/src/konqnewsessiondlg_base.ui 2008-05-21 10:32:49.000000000 +0200 +++ new/kdebase-4.1.0/apps/konqueror/src/konqnewsessiondlg_base.ui 2008-07-23 10:25:27.000000000 +0200 @@ -32,6 +32,9 @@ <property name="text" > <string>Save open tabs and windows for easy retrieval</string> </property> + <property name="wordWrap"> + <bool>true</bool> + </property> <property name="buddy" > <cstring>m_pSessionName</cstring> </property> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-4.0.99/apps/konsole/src/MainWindow.cpp new/kdebase-4.1.0/apps/konsole/src/MainWindow.cpp --- old/kdebase-4.0.99/apps/konsole/src/MainWindow.cpp 2008-07-03 07:05:17.000000000 +0200 +++ new/kdebase-4.1.0/apps/konsole/src/MainWindow.cpp 2008-07-23 10:25:29.000000000 +0200 @@ -110,10 +110,17 @@ } void MainWindow::removeMenuAccelerators() { + // regular expression to find accelerators in menu items. + // Matches the '&' character anywhere in the text (for Western languages) + // or " (&Letters)" (for many non-Western languages) + // + // Translators can change or remove this as necessary for their language + static QString stripPattern("\$\\s*\\&.*\$|\\&"); + static QRegExp acceleratorStripRegExp(stripPattern); foreach(QAction* menuItem, menuBar()->actions()) { QString itemText = menuItem->text(); - itemText.remove('&'); + itemText.remove(acceleratorStripRegExp); menuItem->setText(itemText); } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-4.0.99/CMakeLists.txt new/kdebase-4.1.0/CMakeLists.txt --- old/kdebase-4.0.99/CMakeLists.txt 2008-06-18 14:41:40.000000000 +0200 +++ new/kdebase-4.1.0/CMakeLists.txt 2008-07-23 10:25:50.000000000 +0200 @@ -16,7 +16,6 @@ find_package(KDE4 REQUIRED) include (KDE4Defaults) include (MacroLibrary) -include(MacroOptionalAddSubdirectory) include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES}) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0