openSUSE Commits
Threads by month
- ----- 2024 -----
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
April 2010
- 2 participants
- 1248 discussions
Hello community,
here is the log from the commit of package installation-images for openSUSE:Factory
checked in at Mon Apr 26 17:21:32 CEST 2010.
--------
--- installation-images/installation-images.changes 2010-04-22 21:28:01.000000000 +0200
+++ installation-images/installation-images.changes 2010-04-26 16:10:43.000000000 +0200
@@ -1,0 +2,5 @@
+Mon Apr 26 16:10:30 CEST 2010 - snwint(a)suse.de
+
+- rewrote package handling
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
installation-images-12.49.tar.bz2
needed_space_in_mb
new.patch
New:
----
installation-images-12.50.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ installation-images.spec ++++++
--- /var/tmp/diff_new_pack.2PaOEk/_old 2010-04-26 17:17:52.000000000 +0200
+++ /var/tmp/diff_new_pack.2PaOEk/_new 2010-04-26 17:17:52.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package installation-images (Version 12.49)
+# spec file for package installation-images (Version 12.50)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -103,10 +103,9 @@
Obsoletes: y2image
AutoReqProv: off
Summary: Installation Image Files
-Version: 12.49
-Release: 2
-Source: installation-images-12.49.tar.bz2
-Patch0: new.patch
+Version: 12.50
+Release: 1
+Source: installation-images-12.50.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define _binary_payload w.ufdio
@@ -176,7 +175,6 @@
%prep
%setup
-%patch0 -p1
rm -f /usr/lib/build/checks/04-check-filelist
%build
++++++ installation-images-12.49.tar.bz2 -> installation-images-12.50.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.49/Makefile new/installation-images-12.50/Makefile
--- old/installation-images-12.49/Makefile 2010-04-22 11:56:58.000000000 +0200
+++ new/installation-images-12.50/Makefile 2010-04-26 16:08:12.000000000 +0200
@@ -42,7 +42,8 @@
DESTDIR := images/instsys
ifneq ($(filter i386 x86_64, $(ARCH)),)
-THEMES += Zen
+# needs SLES themes
+# THEMES += Zen
endif
export ARCH THEMES DESTDIR INSTSYS_PARTS BOOT_PARTS WITH_FLOPPY
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.49/VERSION new/installation-images-12.50/VERSION
--- old/installation-images-12.49/VERSION 2010-04-22 15:41:58.000000000 +0200
+++ new/installation-images-12.50/VERSION 2010-04-26 16:10:17.000000000 +0200
@@ -1 +1 @@
-12.49
+12.50
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.49/changelog new/installation-images-12.50/changelog
--- old/installation-images-12.49/changelog 2010-04-22 15:42:03.000000000 +0200
+++ new/installation-images-12.50/changelog 2010-04-26 16:10:20.000000000 +0200
@@ -1,4 +1,7 @@
-2010-04-22: HEAD
+2010-04-26: HEAD
+ - rewrote package handling
+
+2010-04-22: 12.49
- fix module config to include some ex-ppc-only modules (bnc #565623)
2010-04-22: 12.48
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.49/data/base/base.file_list new/installation-images-12.50/data/base/base.file_list
--- old/installation-images-12.49/data/base/base.file_list 2010-04-21 17:22:59.000000000 +0200
+++ new/installation-images-12.50/data/base/base.file_list 2010-04-26 14:48:18.000000000 +0200
@@ -88,7 +88,8 @@
/lib*
findutils:
- /usr/bin/{find,xargs}
+ /bin
+ /usr/bin
diffutils:
/usr/bin
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.49/data/base/mlist3 new/installation-images-12.50/data/base/mlist3
--- old/installation-images-12.49/data/base/mlist3 2010-04-21 17:22:59.000000000 +0200
+++ new/installation-images-12.50/data/base/mlist3 2010-04-26 14:35:59.000000000 +0200
@@ -8,7 +8,7 @@
$err = 0;
-for $m (<$modules_dir/*>) {
+for $m (<$modules_dir/*.ko>) {
chomp $m;
chomp(@l = `modinfo -F firmware $m`);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.49/lib/AddFiles.pm new/installation-images-12.50/lib/AddFiles.pm
--- old/installation-images-12.49/lib/AddFiles.pm 2010-04-22 15:38:49.000000000 +0200
+++ new/installation-images-12.50/lib/AddFiles.pm 2010-04-26 14:38:47.000000000 +0200
@@ -59,6 +59,7 @@
sub fixup_re;
+
sub AddFiles
{
local $_;
@@ -66,9 +67,9 @@
my ($rpms, $tdir, $tfile, $p, $r, $rc, $d, $u, $g, $files);
my ($mod_list, @mod_list, %mod_list);
my ($inc_file, $inc_it, $debug, $ifmsg, $ignore);
- my ($old_warn, $ver, $i, $cache_dir, $tmp_cache_dir, $tmp_rpm);
- my (@scripts, $s, @s, %script, $use_cache);
- my (@packs, $sl, $rpm_cmd);
+ my ($old_warn, $ver, $i);
+ my (@scripts, $s, @s, %script);
+ my (@packs, $sl, $rpm_dir);
my (@plog, $current_pack, %acc_all_files, %acc_pack_files, $account);
my ($su, @requires);
@@ -98,13 +99,6 @@
$debug = "pkg";
$debug = $ENV{'debug'} if exists $ENV{'debug'};
- $use_cache = 0;
- $use_cache = $ENV{'cache'} if exists $ENV{'cache'};
- if($use_cache) {
- $cache_dir = $ConfigData{'cache_dir'};
- $tmp_cache_dir = $ConfigData{'tmp_cache_dir'};
- }
-
$ignore = $debug =~ /\bignore\b/ ? 1 : 0;
$account = $debug =~ /\baccount\b/ ? 1 : 0;
@@ -123,31 +117,12 @@
$debug .= ',pkg';
-# if(!$AutoBuild) {
-# $rpms = "$ConfigData{suse_base}/suse";
-# die "$Script: where are the rpms?" unless $ConfigData{suse_base} && -d $rpms;
-# $rpms = "$rpms/*";
-# }
-# else {
-# $rpms = $AutoBuild;
-# die "$Script: where are the rpms?" unless -d $rpms;
-# print "running in autobuild environment\n";
-# }
-
if(! -d $dir) {
die "$Script: failed to create $dir ($!)" unless mkdir $dir, 0755;
}
- if(!($use_cache & 4)) {
- $tdir = "${TmpBase}.dir";
- die "$Script: failed to create $tdir ($!)" unless mkdir $tdir, 0777;
- }
$tfile = "${TmpBase}.afile";
- # see if our rpm understands --nosignature
- $rpm_cmd = "rpm";
- $rpm_cmd .= " --nosignature" if `$rpm_cmd --help` =~ /--nosignature/s;
-
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# now we really start...
@@ -200,16 +175,6 @@
next
}
-# drop these
-# if(/^ifarch\s+/) { $if_val <<= 1; $if_val |= 1 if !/\b$arch\b/ || $arch eq ""; next }
-# if(/^ifnarch\s+/) { $if_val <<= 1; $if_val |= 1 if /\b$arch\b/ && $arch ne ""; next }
-# if(/^ifdef\s+/) { $if_val <<= 1; $if_val |= 1 if !/\b$tag\b/ || $tag eq ""; next }
-# if(/^ifndef\s+/) { $if_val <<= 1; $if_val |= 1 if /\b$tag\b/ && $tag ne ""; next }
-# if(/^ifabuild/) { $if_val <<= 1; $if_val |= 1 if !$AutoBuild; next }
-# if(/^ifnabuild/) { $if_val <<= 1; $if_val |= 1 if $AutoBuild; next }
-# if(/^ifenv\s+(\S+)\s+(\S+)/) { $if_val <<= 1; $if_val |= 1 if $ENV{$1} ne $2; next }
-# if(/^ifnenv\s+(\S+)\s+(\S+)/) { $if_val <<= 1; $if_val |= 1 if $ENV{$1} eq $2; next }
-
if(/^(els)?if\s+(.+)/) {
no integer;
@@ -278,152 +243,43 @@
undef $rc;
undef $r;
- $r = RealRPM $p;
- warn("$Script: no such package: $p"), next unless $r;
- $p = $r;
-
- if($p =~ /^\//) {
- $r = $p;
- warn("$Script: no such package: $r"), next unless -f $r;
- }
- else {
- $r = RPMFileName $p;
-
- if($use_cache) {
- $rc = "$cache_dir/$p.rpm";
- $tmp_rpm = "$tmp_cache_dir/$p";
- }
- warn("$Script: no such package: $p.rpm"), next unless $r && -f $r;
-
- if(($use_cache & 2) && $rc && $r && -f($r) && $rc ne $r) {
- if(! -d($cache_dir)) {
- SUSystem("mkdir -p $cache_dir");
- }
- if(-d $cache_dir) {
- SUSystem("cp -a $r $rc");
- if(-f $rc) {
- $r = $rc;
- }
- else {
- warn "$Script: failed to cache package $r";
- }
- }
- else {
- warn "$Script: failed to create cache dir $cache_dir";
- $use_cache = 0;
- }
- }
- }
+ $rpm_dir = ReadRPM $p;
- $current_pack = $p;
+ next unless $rpm_dir;
- $ver = (`$rpm_cmd -qp $r`)[0];
- $ver = "" unless defined $ver;
- $ver =~ s/\s*$//;
- if($ver =~ /^(\S+)-([^-]+-[^-]+)$/) {
- $ver = $1 eq $p ? " [$2]" : "";
- }
- else {
- $ver = "";
- }
- if($use_cache) {
- if(-d $tmp_rpm) {
- $ver .= '#';
- }
- elsif(defined($rc) && $rc eq $r) {
- $ver .= '*';
- }
- }
+ $current_pack = RealRPM($p)->{name};
- undef $sl;
+ $ver = ReadFile "$rpm_dir/version";
+ $ver = "[$ver]";
- @s = `$rpm_cmd -qp --qf '%|PREIN?{PREIN\n}:{}|%|POSTIN?{POSTIN\n}:{}|%|PREUN?{PREUN\n}:{}|%|POSTUN?{POSTUN\n}:{}|' $r 2>/dev/null`;
- for $s (@s) {
- chomp $s;
- $sl .= "," if $sl;
- $sl .= "\L$s";
- }
- $ver .= " \{$sl\}" if $sl;
+ push @plog, "$current_pack $ver\n";
- push @plog, "$p$ver\n";
+ $_ = ReadFile "$rpm_dir/scripts";
+ $ver .= " {$_}" if $_;
- print "adding package $p$ver\n" if $debug =~ /\bpkg\b/;
+ print "adding package $current_pack $ver\n" if $debug =~ /\bpkg\b/;
- push @packs, "$p\n";
+ push @packs, "$current_pack\n";
for $s (@scripts) {
- @{$script{$s}} =
- @s = `$rpm_cmd --queryformat '%{\U$s\E}' -qp $r 2>/dev/null`;
- if(@s == 0 || $s[0] =~ /^\(none\)\s*$/) {
- warn "$Script: no \"$s\" script in $r";
+ $_ = ReadFile "$rpm_dir/$s";
+ if(!$_) {
+ warn "$Script: no \"$s\" script in $current_pack";
}
else {
print " got \"$s\" script\n" if $debug =~ /\bscripts\b/;
- @{$script{$s}} = @s;
+ $script{$s} = $_;
}
}
if(@requires) {
- @requires = `$rpm_cmd --requires -qp $r 2>/dev/null`;
+ $_ = ReadFile "$rpm_dir/requires";
open R, ">$dir/$p.requires";
- print R @requires;
+ print R $_;
close R;
}
- if(!($use_cache & 4)) {
- SUSystem "rm -rf $tdir" and die "$Script: failed to remove $tdir";
- die "$Script: failed to create $tdir ($!)" unless mkdir $tdir, 0777;
- SUSystem "sh -c 'cd $tdir ; rpm2cpio $r | cpio --quiet --sparse -dimu --no-absolute-filenames'" and
- warn "$Script: failed to extract $r";
- }
- else {
- $tdir = $tmp_rpm;
- if(!-d($tdir)) {
- die "$Script: failed to create $tdir ($!)" unless mkdir $tdir, 0777;
- SUSystem "sh -c 'cd $tdir ; rpm2cpio $r | cpio --quiet --sparse -dimu --no-absolute-filenames'" and
- warn "$Script: failed to extract $r";
-
- if($p eq $ConfigData{kernel_rpm}) {
- my $r2 = RPMFileName "$p-base";
- if($r2 && -f $r2) {
- SUSystem "sh -c 'cd $tdir ; rpm2cpio $r2 | cpio --quiet --sparse -dimu --no-absolute-filenames'" and
- warn "$Script: failed to extract $r2";
- }
- else {
- print STDERR "$Script: no such package: ${p}-base.rpm\n";
- }
-
- $r2 = RPMFileName "$p-extra";
- if($r2 && -f $r2) {
- SUSystem "sh -c 'cd $tdir ; rpm2cpio $r2 | cpio --quiet --sparse -dimu --no-absolute-filenames'" and
- warn "$Script: failed to extract $r2";
- }
- else {
- print STDERR "$Script: no such package: ${p}-extra.rpm\n";
- }
-
- my ($kmp, $kmp_name);
- for $kmp (split(',', $ConfigData{kmp_list})) {
- ($kmp_name = $p) =~ s/^kernel/$kmp-kmp/;
- my $r2 = RPMFileName "$kmp_name";
- (print STDERR "$Script: no such package: ${kmp_name}.rpm\n"), next unless $r2 && -f $r2;
- print "adding kmp $kmp_name\n";
- SUSystem "sh -c 'cd $tdir ; rpm2cpio $r2 | cpio --quiet --sparse -dimu --no-absolute-filenames'" and
- warn "$Script: failed to extract $r2";
- }
-
- my $fw;
- for $fw (split(',', $ConfigData{fw_list})) {
- my $r2 = RPMFileName $fw;
- if($r2 && -f $r2) {
- print "adding firmware $fw\n";
- SUSystem "sh -c 'cd $tdir ; rpm2cpio $r2 | cpio --quiet --sparse -dimu --no-absolute-filenames'" and
- warn "$Script: failed to extract $r2";
- }
- }
- }
- }
- }
+ $tdir = "$rpm_dir/rpm";
}
elsif(!/^[a-zA-Z]\s+/ && /^(.*)$/) {
$files = $1;
@@ -611,7 +467,7 @@
SUSystem "sh -c 'mkdir $dir/install && chmod 777 $dir/install'" and
die "$Script: failed to create $dir/install";
die "$Script: unable to create $pm" unless open W, ">$dir/install/inst.sh";
- print W @{$script{$cmd}};
+ print W $script{$cmd};
close W;
$e = 'E' if $xdir eq 'base';
@@ -687,9 +543,6 @@
$account_size->($dir);
- if(!($use_cache & 4)) {
- SUSystem "rm -rf $tdir";
- }
SUSystem "rm -f $tfile";
open F, ">${dir}.rpms";
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.49/lib/ReadConfig.pm new/installation-images-12.50/lib/ReadConfig.pm
--- old/installation-images-12.49/lib/ReadConfig.pm 2010-04-22 15:38:49.000000000 +0200
+++ new/installation-images-12.50/lib/ReadConfig.pm 2010-04-26 14:45:43.000000000 +0200
@@ -165,13 +165,14 @@
@ISA = qw ( Exporter );
@EXPORT = qw (
$Script $BasePath $LibPath $BinPath $CfgPath $ImagePath $DataPath
- $TmpBase %ConfigData RPMFileName RealRPM $SUBinary SUSystem Print2File $MToolsCfg $AutoBuild
+ $TmpBase %ConfigData ReadFile RealRPM ReadRPM $SUBinary SUSystem Print2File $MToolsCfg $AutoBuild
);
use strict 'vars';
use vars qw (
$Script $BasePath $LibPath $BinPath $CfgPath $ImagePath $DataPath
$TmpBase %ConfigData $SUBinary &RPMFileName &SUSystem &Print2File $MToolsCfg $AutoBuild
+ $rpmData
);
sub DebugInfo
@@ -194,105 +195,161 @@
}
}
+
+sub ReadFile
+{
+ my ($f, $buf);
+
+ open $f, $_[0];
+ sysread($f, $buf, -s $_[0]);
+ close $f;
+
+ return $buf;
+}
+
+
#
+# Returns hash with 'name' and 'file' keys or undef if package does not
+# exist.
#
-#
-sub RPMFileName
-{
- my ($rpm, $file, @f, $x);
+sub RealRPM
+{
local $_;
+ my $rpm = shift;
+ my ($f, @f, @ff, $p, $back, $n, %n);
- $rpm = shift;
-
- $file = $ConfigData{'cache_dir'};
+ return $rpmData->{$rpm} if exists $rpmData->{$rpm};
- if($ConfigData{'use_cache'} && $file && -f "$file/$rpm.rpm") {
+ my $dir = $ConfigData{'suse_base'};
- # print "*$rpm: $file/$rpm.rpm\n";
+ $back = 1 if $rpm =~ s/~$//;
- return "$file/$rpm.rpm";
+ @f = grep { -f } <$dir/$rpm.rpm>;
+ for (@f) {
+ $n = $_;
+ s#^.*/|\.rpm$##g;
+ $n{$_} = $n;
}
- $file = $ConfigData{'tmp_cache_dir'};
+ return $rpmData->{$rpm} = undef if @f == 0;
+
+ $p = $rpm;
+ $p = "\Q$p";
+ $p =~ s/\\\*/([0-9_]+)/g;
+ @f = grep { /^$p$/ } @f;
+ @f = sort @f;
+ # for (@f) { print ">$_<\n"; }
+ $f = pop @f;
+ $f = pop @f if $back;
- if($file && -d $file) {
- $file .= "/.rpms";
- mkdir $file, 0755 unless -d $file;
- $file .= "/$rpm.rpm";
+ return $rpmData->{$f} = $rpmData->{$rpm} = { name => $f, file => $n{$f} } ;
+}
- # print "#$rpm: $file\n" if -f $file;
- return $file if -f $file;
- }
+#
+# 'rpm' is hash as returned from RealRPM().
+#
+sub UnpackRPM
+{
+ my $rpm = shift;
+ my $dir = shift;
- undef $file;
+ return 1 unless $rpm;
- for (`cat $ConfigData{'suse_base'}/find-name-rpm 2>/dev/null`) {
- chomp;
- s/^\.\///;
- if(m#/(\Q$rpm\E|\Q$rpm\E\-[^\-]+\-[^\-]+\.[^.\-]+)\.rpm$#) {
- $file = "$ConfigData{'suse_base'}/$_";
- last;
- }
+ if(SUSystem "sh -c 'cd $dir ; rpm2cpio $rpm->{file} | cpio --quiet --sparse -dimu --no-absolute-filenames'") {
+ warn "$Script: failed to extract $rpm->{name}";
+ return 1;
}
- if(!$file) {
- @f = glob "$ConfigData{'suse_base'}/$rpm.rpm";
- if($f[0] && -f $f[0]) {
- $file = $f[0];
- }
- }
+ return 0;
+}
- if(!$file) {
- @f = glob "$ConfigData{'suse_base'}/$rpm-*-*.rpm";
- for (@f) {
- next if /\.src\.rpm$/;
- if($_ && -f $_ && m#/\Q$rpm\E\-[^\-]+\-[^\-]+\.[^.\-]+\.rpm$#) {
- $file = $_;
- last;
- }
- }
- }
- $x = $ConfigData{'tmp_cache_dir'};
+#
+# Unpack rpm to cache dir and return path to dir or undef if failed.
+#
+sub ReadRPM
+{
+ local $_;
+ my ($s, $f, @s);
+
+ my $rpm = RealRPM $_[0];
- if($file && $x && -d($x)) {
- $x .= "/.rpms";
- mkdir $x, 0755 unless -d $x;
- if(-d $x) {
- symlink($file, "$x/$rpm.rpm");
- }
+ if(!$rpm) {
+ warn "$Script: no such package: $_[0]";
+ return undef;
}
- # print "$rpm: $file\n" if $file;
+ my $rpm_cmd = "rpm --nosignature";
+ my $dir = "$ConfigData{tmp_cache_dir}/$rpm->{name}";
+ my $tdir = "$dir/rpm";
- return $file;
-}
+ return $dir if -d $dir;
+ die "$Script: failed to create $dir ($!)" unless mkdir $dir, 0777;
+ die "$Script: failed to create $tdir ($!)" unless mkdir $tdir, 0777;
-sub RealRPM
-{
- my $rpm = shift;
- my ($f, @f, $p, $back);
- local $_;
+ my $err = UnpackRPM $rpm, $tdir;
- my $dir = $ConfigData{'suse_base'};
+ if(!$err) {
+ $_ = `$rpm_cmd -qp --qf '%{VERSION}-%{RELEASE}.%{ARCH}' $rpm->{file} 2>/dev/null`;
+ open $f, ">$dir/version";
+ print $f $_;
+ close $f;
- $back = 1 if $rpm =~ s/~$//;
+ $_ = `$rpm_cmd -qp --requires $rpm->{file} 2>/dev/null`;
+ open $f, ">$dir/requires";
+ print $f $_;
+ close $f;
- @f = <$dir/$rpm.rpm>;
- s#^.*/|\.rpm$##g for @f;
- # @f = grep { !/(-32bit|-debuginfo|-debugsource|-devel)$/ } @f;
- $p = $rpm;
- $p = "\Q$p";
- $p =~ s/\\\*/([0-9_]+)/g;
- @f = grep { /^$p$/ } @f;
- @f = sort @f;
- # for (@f) { print ">$_<\n"; }
- $f = pop @f;
- $f = pop @f if $back;
+ @s = `$rpm_cmd -qp --qf '%|PREIN?{PREIN\n}:{}|%|POSTIN?{POSTIN\n}:{}|%|PREUN?{PREUN\n}:{}|%|POSTUN?{POSTUN\n}:{}|' $rpm->{file} 2>/dev/null`;
+ for (@s) {
+ chomp;
+ $_ = "\L$_";
+ $s = `$rpm_cmd -qp --qf '%{\U$_\E}' $rpm->{file} 2>/dev/null`;
+ open $f, ">$dir/$_";
+ print $f $s;
+ close $f;
+ }
+ if(@s) {
+ $s = join ",", @s;
+ open $f, ">$dir/scripts";
+ print $f "\L$s";
+ close $f;
+ }
+ }
+
+ if(!$err && $rpm->{name} eq $ConfigData{kernel_rpm}) {
+ SUSystem "find $tdir -type d -exec chmod a+rx '{}' \\;";
+
+ $_ = <$tdir/lib/modules/*>;
+ if(-d) {
+ s#.*/##;
+ open $f, ">$dir/kernel";
+ print $f $_;
+ close $f;
+ }
+
+ UnpackRPM RealRPM("$rpm-base"), $tdir;
+ UnpackRPM RealRPM("$rpm-extra"), $tdir;
+
+ my $kmp;
+ for (split(',', $ConfigData{kmp_list})) {
+ ($kmp = $rpm->{name}) =~ s/^kernel/$_-kmp/;
+ print "adding kmp $kmp\n";
+ UnpackRPM RealRPM($kmp), $tdir;
+ }
+
+ for (split(',', $ConfigData{fw_list})) {
+ print "adding firmware $_\n";
+ UnpackRPM RealRPM($_), $tdir;
+ }
+
+ # keep it readable
+ SUSystem "find $tdir -type d -exec chmod a+rx '{}' \\;";
+ }
- return $f;
+ return $err ? undef : $dir;
}
@@ -330,16 +387,16 @@
sub KernelImg
{
local $_;
- my ($k_regexp, @k_files, @k_images, @kernels);
+ my ($k_files, @k_images);
- ($k_regexp, @k_files) = @_;
+ $k_files = shift;
- chomp @k_files;
+ chomp @$k_files;
- for (@k_files) {
- s#^/boot/##;
+ for (@$k_files) {
+ s#.*/boot/##;
next if /autoconf|config|shipped|version/; # skip obvious garbage
- push @k_images, $_ if m#$k_regexp#;
+ push @k_images, $_ if m#$ConfigData{kernel_img}#;
}
return @k_images;
@@ -639,57 +696,10 @@
$tmp_cache_dir .= "/${BasePath}tmp/cache/$ConfigData{dist}";
$ConfigData{'tmp_cache_dir'} = $tmp_cache_dir;
system "mkdir -p $tmp_cache_dir" unless -d $tmp_cache_dir;
- my $use_cache = 0;
- $ENV{'cache'} = 4 unless exists $ENV{'cache'};
- $use_cache = $ENV{'cache'} if exists $ENV{'cache'};
- $ConfigData{'use_cache'} = $use_cache;
-
- if($in_abuild) {
- my (@k_images2, %k_rpms);
-
- my @k_images = KernelImg $ConfigData{kernel_img}, (`find $ConfigData{buildroot}/boot -type f`);
-
- if(!@k_images) {
- die "Error: No kernel image identified! (Looking for \"$ConfigData{kernel_img}\" in \"$ConfigData{kernel_rpm}\".)\n\n";
- }
-
- $i = $ConfigData{buildroot} ? "-r $ConfigData{buildroot}" : "";
-
- for (@k_images) {
- $j = `rpm $i -qf /boot/$_ | head -n 1 | sed 's/-[^-]*-[^-]*\$//'` if -f "$ConfigData{buildroot}/boot/$_";
- chomp $j;
- undef $j if $j =~ /^file /; # avoid "file ... not owned by any package"
- $j =~ s/\-base$//;
- $k_rpms{$_} = $j if $j;
- if($j && $j eq $ConfigData{kernel_rpm}) {
- push @k_images2, $_;
- }
- }
-
- if(@k_images == 1) {
- # ok, use just this one
- $ConfigData{kernel_img} = $k_images[0];
- }
- else {
- if(!@k_images2) {
- die "Error: No kernel image identified! (Looking for \"$ConfigData{kernel_img}\" in \"$ConfigData{kernel_rpm}\".)\n\n";
- }
- elsif(@k_images2 > 1) {
- warn
- "Warning: Can't identify the real kernel image, choosing the first:\n",
- join(", ", @k_images2), "\n\n";
- }
- $ConfigData{kernel_img} = $k_images2[0];
- }
- $ConfigData{kernel_rpm} = $k_rpms{$ConfigData{kernel_img}} if $k_rpms{$ConfigData{kernel_img}};
-
- $kv = `rpm $i -ql $ConfigData{kernel_rpm} 2>/dev/null | grep -m 1 modules | cut -d / -f 4`;
- }
- else {
- $i = RPMFileName "$ConfigData{kernel_rpm}-base";
-
- my @k_images = KernelImg $ConfigData{kernel_img}, (`rpm -qlp $i 2>/dev/null | grep ^/boot`);
+ my $k_dir = ReadRPM $ConfigData{kernel_rpm};
+ if($k_dir) {
+ my @k_images = KernelImg [ `find $k_dir/rpm/boot -type f` ];
if(!@k_images) {
die "Error: No kernel image identified! (Looking for \"$ConfigData{kernel_img}\".)\n\n";
@@ -700,14 +710,9 @@
}
$ConfigData{kernel_img} = $k_images[0];
-
- $kv = `rpm -qlp $i 2>/dev/null | grep -m 1 modules | cut -d / -f 4`;
+ $ConfigData{kernel_ver} = ReadFile "$k_dir/kernel";
+ $ConfigData{module_type} = 'ko';
}
- chomp $kv;
-
- $ConfigData{kernel_ver} = $kv;
-
- $ConfigData{module_type} = $kv =~ /^2\.[0-4]\./ ? "o" : "ko";
# print STDERR "kernel_img = $ConfigData{kernel_img}\n";
# print STDERR "kernel_rpm = $ConfigData{kernel_rpm}\n";
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
Hello community,
FYI: Package openSUSE-images was dropped from openSUSE:Factory at Mon Apr 26 12:03:15 CEST 2010.
You can find the latest sources of the package in the
openSUSE:Dropped
repository:
https://build.opensuse.org/package/show?project=openSUSE:Dropped&package=op…
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
Hello community,
here is the log from the commit of package python-compizconfig for openSUSE:Factory
checked in at Mon Apr 26 09:52:14 CEST 2010.
--------
--- python-compizconfig/python-compizconfig.changes 2009-12-07 11:51:11.000000000 +0100
+++ /mounts/work_src_done/STABLE/python-compizconfig/python-compizconfig.changes 2010-04-26 09:49:34.000000000 +0200
@@ -1,0 +2,5 @@
+Mon Apr 26 07:48:59 UTC 2010 - dimstar(a)opensuse.org
+
+- Drop pkg-config file. We do not offer libs or anything else here.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-compizconfig.spec ++++++
--- /var/tmp/diff_new_pack.IinkBC/_old 2010-04-26 09:51:51.000000000 +0200
+++ /var/tmp/diff_new_pack.IinkBC/_new 2010-04-26 09:51:51.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package python-compizconfig (Version 0.8.4)
#
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,7 +19,7 @@
Name: python-compizconfig
Version: 0.8.4
-Release: 1
+Release: 2
License: GPLv2+
Summary: Python bindings for libraries/plugins for compizconfig-settings
Url: http://opencompositing.org
@@ -65,13 +65,13 @@
%install
%makeinstall
%{__rm} %{buildroot}%{py_sitedir}/*.la
+%{__rm} %{buildroot}%{_libdir}/pkgconfig/*
%clean
%__rm -rf %{buildroot}
%files
%defattr(-, root, root)
-%{_libdir}/pkgconfig/*
%{py_sitedir}/compizconfig*
%changelog
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
Hello community,
FYI: Package dazuko was dropped from openSUSE:Factory at Sun Apr 25 19:00:30 CEST 2010.
You can find the latest sources of the package in the
openSUSE:Dropped
repository:
https://build.opensuse.org/package/show?project=openSUSE:Dropped&package=da…
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
![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
25 Apr '10
Hello community,
here is the log from the commit of package hicolor-icon-theme-branding-openSUSE for openSUSE:Factory
checked in at Sun Apr 25 18:59:36 CEST 2010.
--------
New Changes file:
--- /dev/null 2010-04-12 17:03:46.000000000 +0200
+++ /mounts/work_src_done/STABLE/hicolor-icon-theme-branding-openSUSE/hicolor-icon-theme-branding-openSUSE.changes 2010-04-25 18:59:00.788683000 +0200
@@ -0,0 +1,5 @@
+-------------------------------------------------------------------
+Fri Feb 12 13:34:23 CET 2010 - vuntz(a)opensuse.org
+
+- New package, to get a distributor logo installed in hicolor.
+
calling whatdependson for head-i586
New:
----
COPYING
hicolor-icon-theme-branding-openSUSE.changes
hicolor-icon-theme-branding-openSUSE.spec
hicolor-icon-theme-branding.changes.in
hicolor-icon-theme-branding.spec.in
pre_checkin.sh
suse-icon.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ hicolor-icon-theme-branding-openSUSE.spec ++++++
#
# spec file for package hicolor-icon-theme-branding-openSUSE (Version 11.3)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
%define build_openSUSE 1
%define build_SLED 0
# Do not edit this auto generated file! Edit hicolor-icon-theme-branding.spec.in.
Name: hicolor-icon-theme-branding-openSUSE
License: GPLv2+
Version: 11.3
Release: 1
Summary: openSUSE branding of hicolor-icon-theme
Group: System/X11/Utilities
Source0: suse-icon.tar.bz2
Source1: COPYING
BuildRequires: hicolor-icon-theme
%define hicolor_icon_theme_version %(rpm -q --qf '%%{version}-%%{release}' hicolor-icon-theme)
Provides: hicolor-icon-theme-branding = %{hicolor_icon_theme_version}
Conflicts: otherproviders(hicolor-icon-theme-branding)
Supplements: packageand(hicolor-icon-theme:branding-openSUSE)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
%description
This package provides openSUSE Look and Feel for hicolor-icon-theme.
%prep
%setup -q -c %{name}-%{version}
cp -a %{SOURCE1} .
%build
%install
for size in 16 22 32 48; do
install -D -m 0644 suse${size}.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${size}x${size}/apps/distributor.png
done
install -D -m 0644 suse.svg $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/distributor.svg
%clean
rm -rf %{buildroot}
%files
%defattr(-,root,root)
%doc COPYING
%{_datadir}/icons/hicolor/*/*/*.*
%changelog
++++++ COPYING ++++++
OpenSUSE EULA
Novell Software License Agreement
PLEASE READ THIS AGREEMENT CAREFULLY. BY DOWNLOADING, INSTALLING OR OTHERWISE USING THE SOFTWARE (INCLUDING ITS COMPONENTS), YOU AGREE TO THE TERMS OF THIS AGREEMENT. IF YOU DO NOT AGREE WITH THESE TERMS, DO NOT DOWNLOAD, INSTALL OR USE THE SOFTWARE AND, IF APPLICABLE, RETURN THE ENTIRE UNUSED PACKAGE TO THE RESELLER WITH YOUR RECEIPT FOR A REFUND. EXCEPT AS EXPRESSLY PERMITTED IN THIS AGREEMENT, THE SOFTWARE MAY NOT BE FURTHER DISTRIBUTED WITHOUT PRIOR WRITTEN AUTHORIZATION FROM NOVELL.
The Software is a modular operating system. Most of the components are open source packages, developed independently, and accompanied by separate license terms; the Software as a whole is a collective work of Novell. Your license rights with respect to individual components accompanied by separate license terms are defined by those terms; nothing in this Agreement (including, for example, the "Other License Terms and Restrictions," below) shall restrict, limit, or otherwise affect any rights or obligations You may have, or conditions to which You may be subject, under such license terms.
RIGHTS AND LICENSES
This Novell Software License Agreement ("Agreement") is a legal agreement between You (an entity or a person) and Novell, Inc. ("Novell") with respect to the software product identified in the title of this Agreement, media (if any) and accompanying documentation (collectively the "Software").
You may make and distribute outside Your Organization an unlimited number of copies of the Software.
You may modify the Software, and distribute outside Your Organization an unlimited number of copies of the modified Software, provided that: a) You remove all Novell trademarks and logos from the Software and do not use any Novell trademarks or logos in distributing the modified Software (Novell trademarks and logos include, but are not limited to, 'Novell', 'SUSE', and the SUSE gecko drawing.); OR, b) You agree to and comply with the requirements set forth in the redistribution program, the terms and conditions of which are set forth at http://www.opensuse.org/Legal.
You may make and use unlimited copies of the Software for Your distribution and use within Your Organization.
The term "Organization" means a legal entity, excluding subsidiaries and affiliates with a separate existence for tax purposes or for legal personality purposes. An example of an Organization in the private sector would be a corporation, partnership, or trust, excluding any subsidiaries or affiliates of the organization with a separate tax identification number or company registration number. In the public sector, an example of Organization would be a specific government body or local government authority.
While the license terms for a component may authorize You to distribute the component, You may not use any Novell trademarks and logos in distributing the component, whether or not the component contains Novell marks.
OTHER LICENSE TERMS AND RESTRICTIONS
The Software is protected by the copyright laws and treaties of the United States ("U.S.") and other countries and is subject to the terms of this Agreement. The Software is licensed to You, not sold.
The Software may be bundled with other software programs ("Bundled Programs"). Your license rights with respect to Bundled Programs accompanied by separate license terms are defined by those terms; nothing in this Agreement shall restrict, limit, or otherwise affect any rights or obligations You may have, or conditions to which You may be subject, under such license terms.
Novell reserves all rights not expressly granted to You. You may not: (1) reverse engineer, decompile, or disassemble the Software except and only to the extent it is expressly permitted by applicable law or the license terms accompanying a component of the Software; or (2) transfer the Software or Your license rights under this Agreement, in whole or in part.
MAINTENANCE AND SUPPORT
Novell has no obligation to provide maintenance or support for the Software.
OWNERSHIP RIGHTS
No title to or ownership of the Software is transferred to You. Novell and/or its licensors owns and retains all title and ownership of all intellectual property rights in the Software, including any adaptations or copies. You acquire only a license to use the Software.
LIMITED WARRANTY
For ninety (90) days from Your date of purchase or download, Novell warrants that (1) any media on which the Software is delivered is free from physical defects; and (2) the Software will substantially conform to the documentation accompanying the Software. If the defective items are returned to Novell or if You report the nonconformity to Novell within ninety (90) days from the date of purchase, Novell will at its sole discretion either resolve the nonconformity or refund the license fees You paid for the Software. Any misuse or unauthorized modification of the Software voids this warranty. THE FOREGOING WARRANTY IS YOUR SOLE AND EXCLUSIVE REMEDY AND IS IN LIEU OF ALL OTHER WARRANTIES, EXPRESS OR IMPLIED. (The foregoing warranty does not apply to Software provided free of charge. SUCH SOFTWARE IS PROVIDED "AS IS" WITHOUT ANY WARRANTIES OF ANY KIND.)
THE SOFTWARE IS NOT DESIGNED, MANUFACTURED OR INTENDED FOR USE OR DISTRIBUTION WITH ON-LINE CONTROL EQUIPMENT IN HAZARDOUS ENVIRONMENTS REQUIRING FAIL-SAFE PERFORMANCE, SUCH AS IN THE OPERATION OF NUCLEAR FACILITIES, AIRCRAFT NAVIGATION, COMMUNICATION, OR CONTROL SYSTEMS, DIRECT LIFE SUPPORT MACHINES, WEAPONS SYSTEMS, OR OTHER USES IN WHICH FAILURE OF THE SOFTWARE COULD LEAD DIRECTLY TO DEATH, PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE.
THE SOFTWARE IS ONLY COMPATIBLE WITH CERTAIN COMPUTERS AND OPERATING SYSTEMS. THE SOFTWARE IS NOT WARRANTED FOR NON-COMPATIBLE SYSTEMS. Call Novell or Your dealer for information about compatibility.
Non-Novell Products. The Software may include or be bundled with hardware or other software programs licensed or sold by a licensor other than Novell. NOVELL DOES NOT WARRANT NON-NOVELL PRODUCTS. ANY SUCH PRODUCTS ARE PROVIDED ON AN "AS IS" BASIS. ANY WARRANTY SERVICE FOR NON-NOVELL PRODUCTS IS PROVIDED BY THE PRODUCT LICENSOR IN ACCORDANCE WITH THE APPLICABLE LICENSOR WARRANTY.
EXCEPT AS OTHERWISE RESTRICTED BY LAW, NOVELL DISCLAIMS AND EXCLUDES ANY AND ALL IMPLIED WARRANTIES INCLUDING ANY WARRANTIES OF MERCHANTABILITY, TITLE, NON-INFRINGEMENT, OR FITNESS FOR A PARTICULAR PURPOSE. NOVELL MAKES NO WARRANTY, REPRESENTATION OR PROMISE NOT EXPRESSLY SET FORTH IN THIS LIMITED WARRANTY. NOVELL DOES NOT WARRANT THAT THE SOFTWARE WILL SATISFY YOUR REQUIREMENTS OR THAT THE OPERATION OF THE SOFTWARE WILL BE UNINTERRUPTED. Some jurisdictions do not allow certain disclaimers and limitations of warranties, so portions of the above limitations may not apply to You. This limited warranty gives You specific rights and You may also have other rights which vary from state to state.
LIMITATION OF LIABILITY
(a) Consequential Losses. NEITHER NOVELL NOR ANY OF ITS LICENSORS, SUBSIDIARIES, OR EMPLOYEES WILL IN ANY CASE BE LIABLE FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, INDIRECT, TORT, ECONOMIC OR PUNITIVE DAMAGES ARISING OUT OF THE USE OF OR INABILITY TO USE THE SOFTWARE, INCLUDING WITHOUT LIMITATION LOSS OF PROFITS, BUSINESS OR DATA, EVEN IF ADVISED OF THE POSSIBILITY OF THOSE DAMAGES.
(b) Direct Damages. IN NO EVENT WILL NOVELL'S AGGREGATE LIABILITY FOR DIRECT DAMAGES TO PROPERTY OR PERSON (WHETHER IN ONE INSTANCE OR A SERIES OF INSTANCES) EXCEED 1.25 TIMES THE AMOUNT PAID BY YOU FOR THE SOFTWARE OUT OF WHICH SUCH CLAIM AROSE [OR $50 (U.S.) IF YOU RECEIVED THE SOFTWARE FREE OF CHARGE]. The above exclusions and limitations will not apply to claims relating to death or personal injury. In those jurisdictions that do not allow the exclusion or limitation of damages, Novell's liability shall be limited or excluded to the maximum extent allowed within those jurisdictions.
GENERAL TERMS
Term. This Agreement becomes effective on the date You legally acquire the Software and will automatically terminate if You breach any of its terms. Upon termination of this Agreement, You must destroy the original and all copies of the Software or return them to Novell and delete the Software from Your systems.
Benchmark Testing. This benchmark testing restriction applies to You if You are a software vendor or if You are performing testing on the Software at the direction of or on behalf of a software vendor. You may not, without Novell's prior written consent not to be unreasonably withheld, publish or disclose to any third party the results of any benchmark test of the Software. If You are a vendor of products that are functionally similar to or compete with the Software ("Similar Products"), or are acting on behalf of such a vendor, and You publish or disclose benchmark information on the Software in violation of this restriction, then notwithstanding anything to the contrary in the Similar Product's end user license agreement, and in addition to any other remedies Novell may have, Novell shall have the right to perform benchmark testing on Similar Products and to disclose and publish that benchmark information and You hereby represent that You have authority to grant such right to Novell.
Transfer. This Agreement may not be transferred or assigned without the prior written approval of Novell.
Law and Jurisdiction. This Agreement is governed by the laws of the State of Utah, U.S. Any action at law relating to this Agreement may only be brought before the courts of competent jurisdiction of the State of Utah. If, however, Your country of principal residence is a member state of the European Union or the European Free Trade Association, this Agreement is governed by the laws of that country, and any action at law may only be brought before a court of competent jurisdiction of that country.
Entire Agreement. This Agreement and the Upgrade/Additive Agreement (if applicable) sets forth the entire understanding and agreement between You and Novell and may be amended only in a writing signed by both parties. NO LICENSOR, DISTRIBUTOR, DEALER, RETAILER, RESELLER, SALES PERSON, OR EMPLOYEE IS AUTHORIZED TO MODIFY THIS AGREEMENT OR TO MAKE ANY REPRESENTATION OR PROMISE THAT IS DIFFERENT FROM, OR IN ADDITION TO, THE TERMS OF THIS AGREEMENT.
Waiver. No waiver of any right under this Agreement will be effective unless in writing, signed by a duly authorized representative of the party to be bound. No waiver of any past or present right arising from any breach or failure to perform will be deemed to be a waiver of any future right arising under this Agreement.
Severability. If any provision in this Agreement is invalid or unenforceable, that provision will be construed, limited, modified or, if necessary, severed, to the extent necessary, to eliminate its invalidity or unenforceability, and the other provisions of this Agreement will remain unaffected.
Export Compliance. Any person or entity exporting or re-exporting Novell products directly or indirectly and via any means, including electronic transfer, is wholly responsible for doing so in accordance with the U.S. Export Administration Regulations and the laws of host countries. Novell assumes no responsibility or liability for your failure to obtain any necessary export approvals. Approvals are dependent upon an item's technical characteristics, the destination, end-use and end-user, as well as other activities of the end user. Specifically, no Novell product may be exported to embargoed or otherwise restricted countries or end users. Please consult the Bureau of Industry and Security web page and other sources before exporting Novell products from the U.S. and familiarize yourself with the laws of destination countries before re-exporting Novell products. This provision shall survive the expiration or earlier termination of this Agreement. Please refer to the export matrix for Novell products for more information on exporting Novell Software. You can download a copy from http://www.novell.com/info/exports/ or obtain a copy from your local Novell office.
U.S. Government Restricted Rights. Use, duplication, or disclosure by the U.S. Government is subject to t DFARS 252.227-7013 (b)(3) (Nov 1995), or applicable successor clauses. Contractor/ Manufacturer is Novell, Inc., 1800 South Novell Place, Provo, Utah 84606.
Other. The application of the United Nations Convention of Contracts for the International Sale of Goods is expressly excluded.
?1993, 2000-2006 Novell, Inc. All Rights Reserved.
Novell is a registered trademark, and SUSE LINUX is registered trademark, and the SUSE logo is a trademark, of SUSE LINUX Products GmbH, a Novell company, in the United States and other countries. Linux is a registered trademark of Linus Torvalds.
++++++ hicolor-icon-theme-branding.changes.in ++++++
-------------------------------------------------------------------
Fri Feb 12 13:34:23 CET 2010 - vuntz(a)opensuse.org
- New package, to get a distributor logo installed in hicolor.
++++++ hicolor-icon-theme-branding.spec.in ++++++
#
# spec file for package hicolor-icon-theme-branding-%{branding_name} (Version 11.3)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
%define build_openSUSE 0
%define build_SLED 0
Name: hicolor-icon-theme-branding-%{branding_name}
License: GPL v2 or later
Version: 11.3
Release: 1
Summary: %{branding_name} branding of hicolor-icon-theme
Group: System/X11/Utilities
Source0: suse-icon.tar.bz2
Source1: COPYING
BuildRequires: hicolor-icon-theme
%define hicolor_icon_theme_version %(rpm -q --qf '%%{version}-%%{release}' hicolor-icon-theme)
Provides: hicolor-icon-theme-branding = %{hicolor_icon_theme_version}
Conflicts: otherproviders(hicolor-icon-theme-branding)
Supplements: packageand(hicolor-icon-theme:branding-%{branding_name})
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
%description
This package provides %{branding_name} Look and Feel for hicolor-icon-theme.
%prep
%setup -q -c %{name}-%{version}
cp -a %{SOURCE1} .
%build
%install
for size in 16 22 32 48; do
install -D -m 0644 suse${size}.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${size}x${size}/apps/distributor.png
done
install -D -m 0644 suse.svg $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/distributor.svg
%clean
rm -rf %{buildroot}
%files
%defattr(-,root,root)
%doc COPYING
%{_datadir}/icons/hicolor/*/*/*.*
%changelog
++++++ pre_checkin.sh ++++++
#!/bin/sh
NAME=hicolor-icon-theme
if ! test -f ${NAME}-branding.spec.in ; then
exit
fi
for variant in openSUSE ; do
cp ${NAME}-branding.spec.in ${NAME}-branding-${variant}.spec
cp ${NAME}-branding.changes.in ${NAME}-branding-${variant}.changes
sed -i "s/%{branding_name}/${variant}/g" ${NAME}-branding-${variant}.spec
sed -i "s/\(%define *build_${variant} *\)0/\11/" ${NAME}-branding-${variant}.spec
sed -i "
/^Name: *${NAME}-branding-${variant}/i \
# Do not edit this auto generated file! Edit ${NAME}-branding.spec.in.
" ${NAME}-branding-${variant}.spec
done
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
Hello community,
here is the log from the commit of package brltty for openSUSE:Factory
checked in at Sun Apr 25 18:57:19 CEST 2010.
--------
New Changes file:
--- /dev/null 2010-04-12 17:03:46.000000000 +0200
+++ /mounts/work_src_done/STABLE/brltty/brltty.changes 2010-04-08 18:32:15.000000000 +0200
@@ -0,0 +1,15 @@
+-------------------------------------------------------------------
+Thu Apr 8 18:31:44 CEST 2010 - vuntz(a)opensuse.org
+
+- Build libbraille driver.
+
+-------------------------------------------------------------------
+Fri Apr 2 12:31:45 CEST 2010 - vuntz(a)opensuse.org
+
+- Build Speech Dispatcher driver.
+
+-------------------------------------------------------------------
+Thu Apr 1 16:29:54 CEST 2010 - vuntz(a)opensuse.org
+
+- New package.
+
calling whatdependson for head-i586
New:
----
brltty-4.1.tar.bz2
brltty-cppflags.patch
brltty-java-jni-dir.patch
brltty-python-prefix.patch
brltty.changes
brltty.spec
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ brltty.spec ++++++
#
# spec file for package brltty (Version 4.1)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: brltty
Version: 4.1
Release: 1
# FIXME tcl bindings: investigate how to not fail in brp-tcl
# FIXME libbraille driver when libbraille is in factory
License: GPLv2+
Summary: Braille display driver for Linux/Unix
Url: http://mielke.cc/brltty/
Group: System/Daemons
Source0: %{name}-%{version}.tar.bz2
# PATCH-FIX-UPSTREAM brltty-cppflags.patch -- Taken from Fedora, to fix build of java bindings
Patch0: brltty-cppflags.patch
# PATCH-FIX-UPSTREAM brltty-python-prefix.patch vuntz(a)opensuse.org -- Correctly install the python bindings
Patch1: brltty-python-prefix.patch
# PATCH-FIX-OPENSUSE brltty-java-jni-dir.patch vuntz(a)opensuse.org -- Install java file in correct paths (openSUSE use %{_lib})
Patch2: brltty-java-jni-dir.patch
BuildRequires: alsa-devel
BuildRequires: at-spi-devel
BuildRequires: bison
BuildRequires: bluez-devel
BuildRequires: fdupes
BuildRequires: gpm
BuildRequires: java-devel
BuildRequires: jpackage-utils
BuildRequires: ncurses-devel
BuildRequires: libbraille-devel
BuildRequires: libicu-devel
BuildRequires: libspeechd-devel
BuildRequires: ocaml
BuildRequires: python-devel
BuildRequires: pyrex
BuildRequires: subversion
#Buildrequires: tcl-devel
BuildRequires: xorg-x11-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
BRLTTY is a background process (daemon) which provides access to the
Linux/Unix console (when in text mode) for a blind person using a
refreshable braille display. It drives the braille display and provides
complete screen review functionality.
%package driver-at-spi
License: GPLv2+
Summary: AT-SPI driver for BRLTTY
Requires: %{name} = %{version}
Supplements: packageand(brltty:at-spi)
%description driver-at-spi
BRLTTY is a background process (daemon) which provides access to the
Linux/Unix console (when in text mode) for a blind person using a
refreshable braille display. It drives the braille display and provides
complete screen review functionality.
This package contains the AT-SPI screen driver.
%package driver-brlapi
License: GPLv2+
Summary: BrlAPI driver for BRLTTY
Requires: %{name} = %{version}
Supplements: packageand(brltty:libbrlapi0_5)
%description driver-brlapi
BRLTTY is a background process (daemon) which provides access to the
Linux/Unix console (when in text mode) for a blind person using a
refreshable braille display. It drives the braille display and provides
complete screen review functionality.
This package contains the BrlAPI braille driver.
%package driver-libbraille
License: GPLv2+
Summary: Libbraille driver for BRLTTY
Requires: %{name} = %{version}
Supplements: packageand(brltty:libbraille)
%description driver-libbraille
BRLTTY is a background process (daemon) which provides access to the
Linux/Unix console (when in text mode) for a blind person using a
refreshable braille display. It drives the braille display and provides
complete screen review functionality.
This package contains the libbraille braille driver.
%package driver-speech-dispatcher
License: GPLv2+
Summary: Speech Dispatcher driver for BRLTTY
Requires: %{name} = %{version}
Supplements: packageand(brltty:libspeechd2)
%description driver-speech-dispatcher
BRLTTY is a background process (daemon) which provides access to the
Linux/Unix console (when in text mode) for a blind person using a
refreshable braille display. It drives the braille display and provides
complete screen review functionality.
This package contains the Speech Dispatcher speech driver.
%package driver-xwindow
License: GPLv2+
Summary: XWindow driver for BRLTTY
Requires: %{name} = %{version}
Supplements: packageand(brltty:xorg-x11-server)
%description driver-xwindow
BRLTTY is a background process (daemon) which provides access to the
Linux/Unix console (when in text mode) for a blind person using a
refreshable braille display. It drives the braille display and provides
complete screen review functionality.
This package contains the XWindow braille driver.
%package utils
License: GPLv2+
Summary: Braille display driver for Linux/Unix
Requires: %{name} = %{version}
%description utils
BRLTTY is a background process (daemon) which provides access to the
Linux/Unix console (when in text mode) for a blind person using a
refreshable braille display. It drives the braille display and provides
complete screen review functionality.
This package contain various utilities related to BRLTTY.
%package -n xbrlapi
License: GPLv2+
Summary: X BrlAPI helper
Requires: %{name} = %{version}
Supplements: packageand(libbrlapi0_5:xorg-x11-server)
%description -n xbrlapi
The xbrlapi utility is a helper to have BrlAPI work on a X system.
%package -n libbrlapi0_5
License: GPLv2+
Summary: Library to use BRLTTY from applications
Recommends: %{name}
%description -n libbrlapi0_5
BrlAPI is a service provided by the brltty daemon.
Its purpose is to allow programmers to write applications that take
advantage of a braille terminal in order to deliver a blind user
suitable information for his/her specific needs.
While an application communicates with the braille terminal, everything
brltty sends to the braille terminal in the application's console is
ignored, whereas each piece of data coming from the braille terminal is
sent to the application, rather than to brltty.
%package -n brlapi-devel
License: GPLv2+
Summary: Library to use BRLTTY from applications -- Development Files
Requires: libbrlapi0_5 = %{version}
%description -n brlapi-devel
BrlAPI is a service provided by the brltty daemon.
Its purpose is to allow programmers to write applications that take
advantage of a braille terminal in order to deliver a blind user
suitable information for his/her specific needs.
While an application communicates with the braille terminal, everything
brltty sends to the braille terminal in the application's console is
ignored, whereas each piece of data coming from the braille terminal is
sent to the application, rather than to brltty.
%package -n brlapi-java
License: GPLv2+
Summary: Library to use BRLTTY from applications -- Java Bindings
Requires: java
Requires: jpackage-utils
%description -n brlapi-java
BrlAPI is a service provided by the brltty daemon.
Its purpose is to allow programmers to write applications that take
advantage of a braille terminal in order to deliver a blind user
suitable information for his/her specific needs.
While an application communicates with the braille terminal, everything
brltty sends to the braille terminal in the application's console is
ignored, whereas each piece of data coming from the braille terminal is
sent to the application, rather than to brltty.
%package -n ocaml-brlapi
License: GPLv2+
Summary: Library to use BRLTTY from applications -- OCaml Bindings
Requires: ocaml
%description -n ocaml-brlapi
BrlAPI is a service provided by the brltty daemon.
Its purpose is to allow programmers to write applications that take
advantage of a braille terminal in order to deliver a blind user
suitable information for his/her specific needs.
While an application communicates with the braille terminal, everything
brltty sends to the braille terminal in the application's console is
ignored, whereas each piece of data coming from the braille terminal is
sent to the application, rather than to brltty.
%package -n python-brlapi
License: GPLv2+
Summary: Library to use BRLTTY from applications -- Python Bindings
%py_requires
%description -n python-brlapi
BrlAPI is a service provided by the brltty daemon.
Its purpose is to allow programmers to write applications that take
advantage of a braille terminal in order to deliver a blind user
suitable information for his/her specific needs.
While an application communicates with the braille terminal, everything
brltty sends to the braille terminal in the application's console is
ignored, whereas each piece of data coming from the braille terminal is
sent to the application, rather than to brltty.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%build
for i in -I%{_libdir}/jvm/java/include{,/linux}; do
java_inc="$java_inc $i"
done
%configure CPPFLAGS="$java_inc" \
--disable-static \
--with-install-root="%{buildroot}" \
--disable-stripping
%__make %{?jobs:-j%jobs}
%install
%makeinstall
install -D -m644 Documents/brltty.conf %{buildroot}%{_sysconfdir}/brltty.conf
%{__rm} %{buildroot}%{_libdir}/libbrlapi.a
%{__rm} %{buildroot}%{_libdir}/ocaml/brlapi/libbrlapi_stubs.a
# fix missing executable bits
test ! -x %{buildroot}%{_bindir}/brltty-config
chmod a+x %{buildroot}%{_bindir}/brltty-config
# clean up the manuals:
rm Documents/Manual-*/*/{*.mk,*.made,Makefile*,*.sgml,*-[0-9]*.html}
mv Documents/BrlAPIref/html Documents/BrlAPIref/BrlAPIref
# group all the documentation in a doc subdirectory:
find . \( -path ./doc -o -path ./Documents \) -prune -o \
\( -name 'README*' -o -name '*.txt' -o -name '*.html' -o \
-name '*.sgml' -o -name '*.patch' -o \
\( -path './Bootdisks/*' -type f -perm +ugo=x \) \) -print |
while read file; do
mkdir -p doc/${file%/*} && cp -rp $file doc/$file || exit 1
done
%fdupes -s %{buildroot}%{_mandir}
%clean
%{__rm} -rf %{buildroot}
%post -n libbrlapi0_5 -p /sbin/ldconfig
%postun -n libbrlapi0_5 -p /sbin/ldconfig
%files
%defattr(-, root, root)
%doc LICENSE-GPL LICENSE-LGPL README Documents/ChangeLog Documents/CONTRIBUTORS Documents/HISTORY Documents/README.Bluetooth Documents/TODO
%doc Documents/Manual-BRLTTY/
%doc doc/*
%config(noreplace) %{_sysconfdir}/brltty.conf
%{_sysconfdir}/brltty/
%{_bindir}/brltty
%{_bindir}/brltty-config
%{_bindir}/brltty-install
%{_libdir}/brltty/
%doc %{_mandir}/man1/brltty.1*
%exclude %{_libdir}/brltty/libbrlttybba.so
%exclude %{_libdir}/brltty/libbrlttybxw.so
%exclude %{_libdir}/brltty/libbrlttyblb.so
%exclude %{_libdir}/brltty/libbrlttyssd.so
%exclude %{_libdir}/brltty/libbrlttyxas.so
%files driver-at-spi
%defattr(-, root, root)
%{_libdir}/brltty/libbrlttybba.so
%files driver-brlapi
%defattr(-, root, root)
%doc Drivers/Braille/BrlAPI/README
%{_libdir}/brltty/libbrlttybxw.so
%files driver-libbraille
%defattr(-, root, root)
%{_libdir}/brltty/libbrlttyblb.so
%files driver-speech-dispatcher
%defattr(-, root, root)
%doc Drivers/Speech/SpeechDispatcher/README
%{_libdir}/brltty/libbrlttyssd.so
%files driver-xwindow
%defattr(-, root, root)
%doc Drivers/Braille/XWindow/README
%{_libdir}/brltty/libbrlttyxas.so
%files utils
%defattr(-, root, root)
%{_bindir}/vstp
%doc %{_mandir}/man1/vstp.1*
%files -n xbrlapi
%defattr(-, root, root)
%{_bindir}/xbrlapi
%doc %{_mandir}/man1/xbrlapi.1*
%files -n libbrlapi0_5
%defattr(-, root, root)
%doc Documents/Manual-BrlAPI/
%{_libdir}/libbrlapi.so.*
%files -n brlapi-devel
%defattr(-, root, root)
%doc Documents/BrlAPIref/BrlAPIref/
%{_includedir}/brltty/
%{_includedir}/brlapi*.h
%{_libdir}/libbrlapi.so
%doc %{_mandir}/man3/brlapi_*
%files -n brlapi-java
%defattr(-, root, root)
%{_jnidir}/libbrlapi_java.so
%{_javadir}/brlapi.jar
%files -n ocaml-brlapi
%defattr(-, root, root)
%{_libdir}/ocaml/brlapi/
%{_libdir}/ocaml/stublibs/dllbrlapi_stubs.so*
%files -n python-brlapi
%defattr(-, root, root)
%{python_sitearch}/brlapi.so
%{python_sitearch}/Brlapi-*.egg-info
%changelog
++++++ brltty-cppflags.patch ++++++
2009-05-06 Stepan Kasal <skasal(a)redhat.com>
* Bindings/Java/Makefile.in: Propagate configure-time CPPFLAGS.
--- brltty-3.10/Bindings/Java/Makefile.in.cppflags 2008-07-17 00:19:45.000000000 +0200
+++ brltty-3.10/Bindings/Java/Makefile.in 2009-05-06 17:33:02.000000000 +0200
@@ -36,6 +36,8 @@
JAVA_JNI_FLAGS = @JAVA_JNI_FLAGS@
JAVA_JNI_DESTDIR = $(INSTALL_ROOT)
+CPPFLAGS = @CPPFLAGS@
+
all: jar jni doc
JAVA_SOURCES = $(SRC_DIR)/Brlapi.java \
@@ -56,7 +58,7 @@
$(MKLIB:<name>=$(API_NAME)) $@ bindings.$O $(API_LDFLAGS)
bindings.$O:
- $(CC) $(LIBCFLAGS) $(JAVA_JNI_FLAGS) -o $@ -c $(SRC_DIR)/bindings.c
+ $(CC) $(CPPFLAGS) $(LIBCFLAGS) $(JAVA_JNI_FLAGS) -o $@ -c $(SRC_DIR)/bindings.c
JAVA_JAR_FILE = $(API_NAME).jar
jar: $(JAVA_JAR_FILE)
++++++ brltty-java-jni-dir.patch ++++++
Index: brltty-4.1/configure
===================================================================
--- brltty-4.1.orig/configure
+++ brltty-4.1/configure
@@ -8496,7 +8496,7 @@ fi
JAVA_JNI_DIR=""
-for directory in /usr/lib/java /usr/lib/jni
+for directory in /usr/lib64/java /usr/lib64/jni /usr/lib/java /usr/lib/jni
do
test -d "${directory}" && {
JAVA_JNI_DIR="${directory}"
++++++ brltty-python-prefix.patch ++++++
Index: brltty-4.1/Bindings/Python/Makefile.in
===================================================================
--- brltty-4.1.orig/Bindings/Python/Makefile.in
+++ brltty-4.1/Bindings/Python/Makefile.in
@@ -55,7 +55,7 @@ doc: $(PYTHON_API)
INSTALLED_FILES = installed-files
install: all
- set -- --quiet install --skip-build --record "$(INSTALLED_FILES)"; \
+ set -- --quiet install --skip-build --record "$(INSTALLED_FILES)" --prefix "$(prefix)"; \
[ -z "$(PYTHON_DESTDIR)" ] || set -- "$${@}" --root "$(PYTHON_DESTDIR)"; \
$(PYTHON) ./setup.py "$${@}"
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
Hello community,
here is the log from the commit of package at-spi-sharp for openSUSE:Factory
checked in at Sun Apr 25 18:56:53 CEST 2010.
--------
New Changes file:
--- /dev/null 2010-04-12 17:03:46.000000000 +0200
+++ /mounts/work_src_done/STABLE/at-spi-sharp/at-spi-sharp.changes 2010-04-05 21:08:53.000000000 +0200
@@ -0,0 +1,10 @@
+-------------------------------------------------------------------
+Mon Apr 5 19:08:42 UTC 2010 - sshaw(a)decriptor.com
+
+- Updated to 1.0.1
+
+-------------------------------------------------------------------
+Tue Dec 1 02:59:08 UTC 2009 - sshaw(a)decriptor.com
+
+- Initial release of at-spi-sharp
+
calling whatdependson for head-i586
New:
----
at-spi-sharp-1.0.1.tar.bz2
at-spi-sharp.changes
at-spi-sharp.spec
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ at-spi-sharp.spec ++++++
#
# spec file for package at-spi-sharp (Version 1.0.1)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: at-spi-sharp
Version: 1.0.1
Release: 1
License: MIT
Group: System/Libraries
Url: http://www.mono-project.com/Accessibility
Source0: %{name}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: mono-core >= 2.4
BuildRequires: mono-devel >= 2.4
BuildRequires: mono-uia >= 2.0
BuildRequires: ndesk-dbus-glib-devel
BuildRequires: pkg-config
Summary: C# bindings for at-spi
%description
C# mono bindings for at-spi
%package devel
License: MIT
Group: Development/Libraries/mono
Summary: Devel package for at-spi-sharp mono bindings
Requires: %{name} = %{version}
%description devel
Devel package that contains the pc file for at-spi-sharp
%prep
%setup -q
%build
%configure --disable-tests
#make %{?_smp_flags}
make
%install
%makeinstall
%clean
rm -rf %{buildroot}
%files
%defattr(-,root,root)
%dir %{_prefix}/lib/mono/gac/at-spi-sharp/
%{_prefix}/lib/mono/accessibility/at-spi-sharp.dll
%{_prefix}/lib/mono/gac/at-spi-sharp/*
%files devel
%defattr(-,root,root)
%{_libdir}/pkgconfig/at-spi-sharp.pc
%changelog
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
Hello community,
here is the log from the commit of package atspiuiasource for openSUSE:Factory
checked in at Sun Apr 25 18:56:38 CEST 2010.
--------
New Changes file:
--- /dev/null 2010-04-12 17:03:46.000000000 +0200
+++ /mounts/work_src_done/STABLE/atspiuiasource/atspiuiasource.changes 2010-04-05 21:07:56.000000000 +0200
@@ -0,0 +1,10 @@
+-------------------------------------------------------------------
+Mon Apr 5 19:07:38 UTC 2010 - sshaw(a)decriptor.com
+
+- Updated to 2.0.2
+
+-------------------------------------------------------------------
+Tue Dec 1 02:15:31 UTC 2009 - sshaw(a)decriptor.com
+
+- Initial Release. 1.8.90
+
calling whatdependson for head-i586
New:
----
atspiuiasource-2.0.2.tar.bz2
atspiuiasource.changes
atspiuiasource.spec
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ atspiuiasource.spec ++++++
#
# spec file for package atspiuiasource (Version 2.0.2)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
Name: atspiuiasource
Version: 2.0.2
Release: 1
License: MIT
Group: System/Libraries
Url: http://www.mono-project.com/Accessibility
Source0: %{name}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: At-spi uia source
BuildRequires: at-spi-sharp-devel >= 1.0
BuildRequires: glib-sharp2 >= 2.12.8
BuildRequires: mono-devel >= 2.4
BuildRequires: mono-uia-devel >= 2.0.2
BuildRequires: pkg-config
%description
At-spi uia source client side
%prep
%setup -q
%build
%configure --disable-tests
#make %{?_smp_mflags}
make
%install
%makeinstall
%clean
rm -rf %{buildroot}
%files
%defattr(-,root,root)
%dir %{_prefix}/lib/mono/gac/AtspiUiaSource
%{_prefix}/lib/mono/gac/AtspiUiaSource/*
%dir %{_libdir}/atspiuiasource
%{_libdir}/atspiuiasource/*
%changelog
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
Hello community,
here is the log from the commit of package ifuse for openSUSE:Factory
checked in at Sun Apr 25 18:56:13 CEST 2010.
--------
New Changes file:
--- /dev/null 2010-04-12 17:03:46.000000000 +0200
+++ /mounts/work_src_done/STABLE/ifuse/ifuse.changes 2010-03-23 20:41:10.000000000 +0100
@@ -0,0 +1,78 @@
+-------------------------------------------------------------------
+Tue Mar 23 20:29:29 CEST 2010 - opensuse(a)sukimashita.com
+
+- Update to 1.0.0:
+ * Return correct exit status on failure
+ * Fix renamed define due to changes in libimobiledevice
+
+-------------------------------------------------------------------
+Tue Feb 02 19:15:32 CEST 2010 - opensuse(a)sukimashita.com
+
+- Update to 0.9.7:
+ * Port to libimobiledevice project name change
+
+-------------------------------------------------------------------
+Sat Jan 23 23:50:45 CEST 2010 - opensuse(a)sukimashita.com
+
+- Update to 0.9.6:
+ * Port to libiphone 0.9.6 API
+ * Improve error message on failed root filesystem access
+ * Notify user if startup fails due to the device having a
+ password set
+ * Fix handling of uuid command line argument
+ * Remove hardcoded allow_other fuse argument
+
+-------------------------------------------------------------------
+Tue Nov 24 22:39:48 CEST 2009 - opensuse(a)sukimashita.com
+
+- Update to 0.9.5:
+ * support file modification times on OS 3.1 and later
+
+-------------------------------------------------------------------
+Thu Oct 29 11:09:28 CEST 2009 - opensuse(a)sukimashita.com
+
+- Update to 0.9.4:
+ * Renamed and moved binary to /usr/bin/ifuse
+ * Rewrite option handling and connect to a specific device
+ * Remove HAL automounting hack
+ * Update to latest libiphone API
+ * Userspace mounting is now preferred
+
+-------------------------------------------------------------------
+Thu Aug 06 23:06:51 CEST 2009 - opensuse(a)sukimashita.com
+
+- Update to 0.9.3:
+ * Moved some libiphone logic into iFuse and adopted to new API
+ * Add hard/symlink/locking support
+ * Add iPhone 3GS support
+ * Improved error code handling
+
+-------------------------------------------------------------------
+Wed May 13 10:30:22 CEST 2009 - opensuse(a)sukimashita.com
+
+- Update to 0.9.1:
+ * Autotools fixes
+
+-------------------------------------------------------------------
+Sun May 10 20:49:48 CEST 2009 - opensuse(a)sukimashita.com
+
+- Update to 0.9.0:
+ * Handle file modes correctly
+ * Improve error handling
+ * Remove references of obsolete libiphone-initconf
+ * Bugfixes
+
+-------------------------------------------------------------------
+Sat Apr 11 14:30:51 CET 2009 - opensuse(a)sukimashita.com
+
+- Update to latest git HEAD
+
+-------------------------------------------------------------------
+Sat Apr 04 11:08:16 CET 2009 - opensuse(a)sukimashita.com
+
+- Make BuildRequires use libiphone-devel without so version
+
+-------------------------------------------------------------------
+Sat Jan 31 12:00:00 CET 2009 - opensuse(a)sukimashita.com
+
+- Initial package created
calling whatdependson for head-i586
New:
----
ifuse-1.0.0.tar.bz2
ifuse.changes
ifuse.spec
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ifuse.spec ++++++
#
# spec file for package ifuse (Version 1.0.0)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
Name: ifuse
Version: 1.0.0
Release: 1
License: LGPL v2 or later
BuildRequires: fuse-devel glib2-devel
BuildRequires: libimobiledevice-devel >= 1.0.0
%if 0%{?opensuse_bs}
%if %{defined fedora_version} || %{defined mandriva_version}
BuildRequires: pkgconfig
%else
BuildRequires: pkg-config
%endif
%if %{defined fedora_version}
%if 0%{?fedora_version} == 10
BuildRequires: libusb-1_0-devel >= 1.0.3
%endif
%endif
%endif
Source: %{name}-%{version}.tar.bz2
Group: System/Filesystems
Summary: Filesystem access for the iPhone, iPod Touch and iPad
Url: http://www.libimobiledevice.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
AutoReqProv: on
%description
iFuse is a FUSE filesystem driver which uses `libimobiledevice` to connect to
devices without the need for a jailbreak.
It is using the native Apple "AFC" protocol, over the normal USB cable in order
to access the iPhone's, iPod Touch's or iPad's media files under Linux.
Authors:
--------
Christophe Fergeau
Jonathan Beck
Matthew Colyer
Martin Aumueller
Nikias Bassen
Paul Sladen
Zach C.
Zoltan Balaton
%if %{defined suse_version}
%endif
%prep
%setup -q -n %{name}-%{version}
%build
export SUSE_ASNEEDED=0
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
%configure
make %{?jobs:-j%jobs}
%install
%{__make} install DESTDIR=$RPM_BUILD_ROOT
%clean
rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%defattr(-,root,root)
%doc AUTHORS COPYING README
%{_bindir}/ifuse
%changelog
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
Hello community,
here is the log from the commit of package synaptiks for openSUSE:Factory
checked in at Sun Apr 25 18:55:27 CEST 2010.
--------
New Changes file:
--- /dev/null 2010-04-12 17:03:46.000000000 +0200
+++ /mounts/work_src_done/STABLE/synaptiks/synaptiks.changes 2010-03-29 21:55:01.000000000 +0200
@@ -0,0 +1,61 @@
+-------------------------------------------------------------------
+Mon Mar 29 19:38:58 UTC 2010 - thomas(a)tleine.de
+
+- backport rev 1097582 from kde repository to Version 0.3.2
+ * fix crashing when configuration is opened in system-settings
+ b.k.o #226005 or http://bitbucket.org/lunar/synaptiks/issue/32/
+
+-------------------------------------------------------------------
+Fri Feb 5 06:23:39 UTC 2010 - tittiatcoke(a)gmail.com
+
+- update to version 0.3.2
+ * Fixed German translation
+ * Fixed “Ignore the following mouse devices” setting
+
+-------------------------------------------------------------------
+Tue Feb 2 14:41:33 UTC 2010 - tittiatcoke(a)gmail.com
+
+- update to version 0.3.1
+ * updated Danish translation
+ * updated Turkish translation
+
+-------------------------------------------------------------------
+Sat Jan 30 17:22:11 UTC 2010 - tittiatcoke(a)gmail.com
+
+- update to version 0.3.0
+ * “Capabilities” page renamed to “Touchpad information” page
+ * Touchpad state at startup can be configured
+ * Touchpad name is shown in touchpad information page
+ * Split synaptiks into a KDED daemon, a System Settings module,
+ and a Plasma applet
+
+-------------------------------------------------------------------
+Tue Jan 5 12:12:04 UTC 2010 - tittiatcoke(a)gmail.com
+
+- update to version 0.2.1
+ * Added Danish translation
+ * Fixed potential memory leak
+
+-------------------------------------------------------------------
+Wed Nov 25 10:28:11 UTC 2009 - tittiatcoke(a)gmail.com
+
+- Update to version 0.2.0
+ * New:
+ + The delay before re-enabling the touchpad after keyboard activity
+ can be configured
+ + Shortcuts can be configured from context menu
+ + The treshold speed for conventional coasting can be configured
+ + Added tapping settings
+ + Added handbook
+ + Added Russian and Turkish translation
+ * Bugs:
+ + Show only one notification for each error
+ + Notification configuration merged into a single dialog accessible
+ from context menu
+ + Disable synaptiks, if no touchpad is found
+ + Fixed version check to maintain compatibility with Xinput 2.0
+ + The touchpad is no longer switched on by stopping typing, if it was
+ disabled by a plugged mouse device
+ + The touchpad is switched on again, if mouse device management is disabled
+ + Handle changes to the list of ignored mouse devices correctly
+
calling whatdependson for head-i586
New:
----
svn-1097582-backport.diff
synaptiks-0.3.2.tar.bz2
synaptiks.changes
synaptiks.spec
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ synaptiks.spec ++++++
#
# spec file for package synaptiks (Version 0.3.2)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright 2009 Buschmann <buschmann23(a)opensuse.org>
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
BuildRequires: kdebase4-workspace-devel >= 4.3.0
BuildRequires: xorg-x11-proto-devel
BuildRequires: update-desktop-files
Name: synaptiks
Summary: A touchpad management tool for KDE
Version: 0.3.2
Release: 1
License: BSD
Group: System/GUI/KDE
Url: http://www.kde-look.org/content/show.php/synaptiks?content=114270
Source0: synaptiks-%{version}.tar.bz2
Patch1: svn-1097582-backport.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: kdebase4-workspace
%kde4_runtime_requires
%description
synaptiks is a touchpad management tool for KDE. It provides a simple
configuration interface and can automatically switch off your touchpad
on keyboard activity or if mouse devices are plugged.
Author:
--------
Sebastian Wiesner
%prep
%setup -n %{name}-%{version}
%patch1
%build
%cmake_kde4 -d build
%make_jobs
%install
cd build
%kde4_makeinstall
%kde_post_install
cd ..
%find_lang %{name}
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%clean
rm -rf $RPM_BUILD_ROOT
%files -f %{name}.lang
%defattr(-,root,root)
%doc CHANGES README COPYING
%dir /usr/share/kde4/apps/synaptiks
%dir /usr/share/kde4/apps/synaptiks/pics
%{_libdir}/kde4/kcm_synaptiks.so
%{_libdir}/kde4/kded_synaptiks.so
%{_libdir}/kde4/plasma_applet_synaptiks.so
/usr/share/dbus-1/interfaces/*.xml
/usr/share/icons/hicolor/scalable/apps/synaptiks.svgz
/usr/share/kde4/apps/synaptiks/pics/*
/usr/share/kde4/apps/synaptiks/synaptiks.notifyrc
/usr/share/kde4/config.kcfg/*.kcfg
/usr/share/kde4/services/kded/synaptiks.desktop
/usr/share/kde4/services/*.desktop
%changelog
++++++ svn-1097582-backport.diff ++++++
diff -ur -p1 synaptiks-0.3.2orig/src/daemon/de.lunaryorn.Touchpad.xml synaptiks-0.3.2/src/daemon/de.lunaryorn.Touchpad.xml
--- src/daemon/de.lunaryorn.Touchpad.xml 2010-02-04 22:49:49.000000000 +0100
+++ src/daemon/de.lunaryorn.Touchpad.xml 2010-03-29 22:05:27.147510532 +0200
@@ -3,15 +3,2 @@
<interface name="de.lunaryorn.Touchpad">
- <property name="on" type="b" access="readwrite"/>
- <property name="circularScrolling" type="b" access="readwrite"/>
- <property name="CircularScrollingTrigger" type="y" access="readwrite"/>
- <property name="horizontalEdgeScrolling" type="b" access="readwrite"/>
- <property name="verticalEdgeScrolling" type="b" access="readwrite"/>
- <property name="cornerCoasting" type="b" access="readwrite"/>
- <property name="costingSpeed" type="d" access="readwrite"/>
- <property name="cornerButtons" type="ay" access="readwrite"/>
- <property name="fingerButtons" type="ay" access="readwrite"/>
- <property name="hasLeftButton" type="b" access="read"/>
- <property name="hasMiddleButton" type="b" access="read"/>
- <property name="hasRightButton" type="b" access="read"/>
- <property name="fingerDetection" type="i" access="read"/>
<method name="isOn">
diff -ur -p1 synaptiks-0.3.2orig/src/daemon/touchpadadaptor.cpp synaptiks-0.3.2/src/daemon/touchpadadaptor.cpp
--- src/daemon/touchpadadaptor.cpp 2010-02-04 22:49:49.000000000 +0100
+++ src/daemon/touchpadadaptor.cpp 2010-03-29 22:05:27.151508909 +0200
@@ -40,6 +40,4 @@ using namespace synaptiks;
template<typename T>
-T respondError(const QXDeviceError &error) {
- QDBusConnection::sessionBus().send(
- QDBusMessage::createError("de.lunaryorn.TouchpadError",
- error.toString()));
+T respondError(Touchpad *touchpad, const QXDeviceError &error) {
+ touchpad->sendErrorReply("de.lunaryorn.TouchpadError", error.toString());
return T();
@@ -58,3 +56,3 @@ QString TouchpadAdaptor::name() const {
} catch (const QXDeviceError &error) {
- return respondError<QString>(error);
+ return respondError<QString>(this->parent(), error);
}
@@ -66,3 +64,3 @@ bool TouchpadAdaptor::isOn() const {
} catch (const QXDeviceError &error) {
- return respondError<bool>(error);
+ return respondError<bool>(this->parent(), error);
}
@@ -74,3 +72,3 @@ void TouchpadAdaptor::setOn(bool on) {
} catch (const QXDeviceError &error) {
- respondError<void>(error);
+ respondError<void>(this->parent(), error);
}
@@ -82,3 +80,3 @@ bool TouchpadAdaptor::circularScrolling(
} catch (const QXDeviceError &error) {
- return respondError<bool>(error);
+ return respondError<bool>(this->parent(), error);
}
@@ -90,3 +88,3 @@ void TouchpadAdaptor::setCircularScrolli
} catch (const QXDeviceError &error) {
- respondError<void>(error);
+ respondError<void>(this->parent(), error);
}
@@ -98,3 +96,3 @@ uchar TouchpadAdaptor::circularScrolling
} catch (const QXDeviceError &error) {
- return respondError<uchar>(error);
+ return respondError<uchar>(this->parent(), error);
}
@@ -108,5 +106,4 @@ void TouchpadAdaptor::setCircularScrolli
Touchpad::TopLeftCornerTrigger);
- QDBusConnection::sessionBus().send(
- QDBusMessage::createError("de.lunaryorn.TouchpadError",
- message));
+ this->parent()->sendErrorReply("de.lunaryorn.TouchpadError",
+ message);
} else {
@@ -116,3 +113,3 @@ void TouchpadAdaptor::setCircularScrolli
} catch (const QXDeviceError &error) {
- respondError<void>(error);
+ respondError<void>(this->parent(), error);
}
@@ -124,3 +121,3 @@ bool TouchpadAdaptor::horizontalEdgeScro
} catch (const QXDeviceError &error) {
- return respondError<bool>(error);
+ return respondError<bool>(this->parent(), error);
}
@@ -132,3 +129,3 @@ void TouchpadAdaptor::setHorizontalEdgeS
} catch (const QXDeviceError &error) {
- respondError<void>(error);
+ respondError<void>(this->parent(), error);
}
@@ -140,3 +137,3 @@ bool TouchpadAdaptor::verticalEdgeScroll
} catch (const QXDeviceError &error) {
- return respondError<bool>(error);
+ return respondError<bool>(this->parent(), error);
}
@@ -148,3 +145,3 @@ void TouchpadAdaptor::setVerticalEdgeScr
} catch (const QXDeviceError &error) {
- respondError<void>(error);
+ respondError<void>(this->parent(), error);
}
@@ -156,3 +153,3 @@ bool TouchpadAdaptor::cornerCoasting() c
} catch (const QXDeviceError &error) {
- return respondError<bool>(error);
+ return respondError<bool>(this->parent(), error);
}
@@ -164,3 +161,3 @@ void TouchpadAdaptor::setCornerCoasting(
} catch (const QXDeviceError &error) {
- respondError<void>(error);
+ respondError<void>(this->parent(), error);
}
@@ -172,3 +169,3 @@ double TouchpadAdaptor::coastingSpeed()
} catch (const QXDeviceError &error) {
- return respondError<double>(error);
+ return respondError<double>(this->parent(), error);
}
@@ -180,3 +177,3 @@ void TouchpadAdaptor::setCoastingSpeed(d
} catch (const QXDeviceError &error) {
- respondError<void>(error);
+ respondError<void>(this->parent(), error);
}
@@ -188,3 +185,3 @@ QByteArray TouchpadAdaptor::cornerButton
} catch (const QXDeviceError &error) {
- return respondError<QByteArray>(error);
+ return respondError<QByteArray>(this->parent(), error);
}
@@ -198,5 +195,3 @@ void TouchpadAdaptor::setCornerButtons(c
"The argument must have at least %1 elements", 4);
- QDBusConnection::sessionBus().send(
- QDBusMessage::createError(
- "de.lunaryorn.TouchpadError", message));
+ this->parent()->sendErrorReply("de.lunaryorn.TouchpadError", message);
}
@@ -204,3 +199,3 @@ void TouchpadAdaptor::setCornerButtons(c
} catch (const QXDeviceError &error) {
- respondError<void>(error);
+ respondError<void>(this->parent(), error);
}
@@ -212,3 +207,3 @@ QByteArray TouchpadAdaptor::fingerButton
} catch (const QXDeviceError &error) {
- return respondError<QByteArray>(error);
+ return respondError<QByteArray>(this->parent(), error);
}
@@ -222,5 +217,3 @@ void TouchpadAdaptor::setFingerButtons(c
"The argument must have at least %1 elements", 3);
- QDBusConnection::sessionBus().send(
- QDBusMessage::createError(
- "de.lunaryorn.TouchpadError", message));
+ this->parent()->sendErrorReply("de.lunaryorn.TouchpadError", message);
}
@@ -228,3 +221,3 @@ void TouchpadAdaptor::setFingerButtons(c
} catch (const QXDeviceError &error) {
- respondError<void>(error);
+ respondError<void>(this->parent(), error);
}
@@ -236,3 +229,3 @@ bool TouchpadAdaptor::hasLeftButton() co
} catch (const QXDeviceError &error) {
- return respondError<bool>(error);
+ return respondError<bool>(this->parent(), error);
}
@@ -244,3 +237,3 @@ bool TouchpadAdaptor::hasMiddleButton()
} catch (const QXDeviceError &error) {
- return respondError<bool>(error);
+ return respondError<bool>(this->parent(), error);
}
@@ -252,3 +245,3 @@ bool TouchpadAdaptor::hasRightButton() c
} catch (const QXDeviceError &error) {
- return respondError<bool>(error);
+ return respondError<bool>(this->parent(), error);
}
@@ -260,3 +253,3 @@ int TouchpadAdaptor::fingerDetection() c
} catch (const QXDeviceError &error) {
- return respondError<int>(error);
+ return respondError<int>(this->parent(), error);
}
diff -ur -p1 synaptiks-0.3.2orig/src/daemon/touchpadadaptor.h synaptiks-0.3.2/src/daemon/touchpadadaptor.h
--- src/daemon/touchpadadaptor.h 2010-02-04 22:49:49.000000000 +0100
+++ src/daemon/touchpadadaptor.h 2010-03-29 22:05:27.153510682 +0200
@@ -52,26 +52,2 @@ namespace synaptiks {
- public:
- Q_PROPERTY(QString name READ name)
- Q_PROPERTY(bool on READ isOn WRITE setOn)
- Q_PROPERTY(bool circularScrolling
- READ circularScrolling WRITE setCircularScrolling)
- Q_PROPERTY(uchar CircularScrollingTrigger READ circularScrollingTrigger
- WRITE setCircularScrollingTrigger)
- Q_PROPERTY(bool horizontalEdgeScrolling READ horizontalEdgeScrolling
- WRITE setHorizontalEdgeScrolling)
- Q_PROPERTY(bool verticalEdgeScrolling READ verticalEdgeScrolling
- WRITE setVerticalEdgeScrolling)
- Q_PROPERTY(bool cornerCoasting
- READ cornerCoasting WRITE setCornerCoasting)
- Q_PROPERTY(double costingSpeed READ coastingSpeed
- WRITE setCoastingSpeed DESIGNABLE false)
- Q_PROPERTY(QByteArray cornerButtons
- READ cornerButtons WRITE setCornerButtons)
- Q_PROPERTY(QByteArray fingerButtons
- READ fingerButtons WRITE setFingerButtons)
- Q_PROPERTY(bool hasLeftButton READ hasLeftButton)
- Q_PROPERTY(bool hasMiddleButton READ hasMiddleButton)
- Q_PROPERTY(bool hasRightButton READ hasRightButton)
- Q_PROPERTY(int fingerDetection READ fingerDetection)
-
public Q_SLOTS:
diff -ur -p1 synaptiks-0.3.2orig/src/daemon/touchpad.h synaptiks-0.3.2/src/daemon/touchpad.h
--- src/daemon/touchpad.h 2010-02-04 22:49:49.000000000 +0100
+++ src/daemon/touchpad.h 2010-03-29 22:05:27.146508808 +0200
@@ -33,2 +33,3 @@
#include "qxdevice.h"
+#include <QtDBus/QDBusContext>
#include <QtCore/QObject>
@@ -130,2 +131,3 @@ namespace synaptiks {
* @code
+ *
* Touchpad *touchpad = Touchpad::findTouchpad(parent);
@@ -161,3 +163,3 @@ namespace synaptiks {
*/
- class Touchpad: public QObject {
+ class Touchpad: public QObject, public QDBusContext {
Q_OBJECT
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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