Mailinglist Archive: opensuse-buildservice (273 mails)

< Previous Next >
[opensuse-buildservice] diff: 1 out of 2 hunks FAILED
  • From: "Sascha 'saigkill' Manns" <samannsml@xxxxxxxxxxxxx>
  • Date: Sun, 4 Jan 2009 22:43:02 +0100
  • Message-id: <200901042243.02874@xxxxxxxxxxxxxxxxxxxxx>
Hello @all,

im working in my Repo (home:saigkill) on updating Packages to 11.1.

Now i have written an Specfile with included diff-File. The osc System
says: 1 out of 2 hunks FAILED.
But the File don't look like a corrupt File.

Can anyone explain, how to work it?
See you Sascha
--
Sincereley yours

Sascha Manns
openSUSE Marketing Team (Weekly News)
openSUSE Build Service
Web: http://saschamanns.gulli.to
Blog: http://lizards.opensuse.org/author/saigkill
diff -Naur mountmanager-0.2.5/configure mountmanager-0.2.5p/configure
--- mountmanager-0.2.5/configure 2008-11-03 18:04:24.000000000 +0100
+++ mountmanager-0.2.5p/configure 2009-01-04 22:26:28.000000000 +0100
@@ -329,25 +329,13 @@
[Desktop Entry]
Type=Application
Name=MountManager
-Name[ru]=MountManager
GenericName=Tool for mounting of partitions
-GenericName[ru]=Инструмент для монтирования разделов
Comment=the program for mounting of storage devices,flash cards, removable
disks in Linux
-Comment[ru]=программа для монтирования устройств хранения данных, флэш карт и
съёмных дисков
Exec=mm
Icon=mm
Terminal=false
-' > resources/desktop/mountmanager-gtk.desktop
-
-cp -r resources/desktop/mountmanager-gtk.desktop
resources/desktop/mountmanager-kde.desktop
-
-echo 'Categories=GTK;System;Settings;
-NotShowIn=KDE;
-' >> resources/desktop/mountmanager-gtk.desktop
-
-echo 'Categories=System;Qt;
-OnlyShowIn=KDE;
-' >> resources/desktop/mountmanager-kde.desktop
+Categories=System
+' > resources/desktop/mountmanager.desktop

############################################################
# Makefile
@@ -435,8 +423,7 @@
install -d \$(ALL_ICONS)
install -d \$(APPLICATIONS)
install -m 644 resources/desktop/mm.png \$(ALL_ICONS)
- install -m 644 resources/desktop/mountmanager-gtk.desktop
\$(APPLICATIONS)/
- install -m 644 resources/desktop/mountmanager-kde.desktop
\$(APPLICATIONS)/
+ install -m 644 resources/desktop/mountmanager.desktop \$(APPLICATIONS)/
@echo
\"+---------------------------------------------------------------------+\"
@echo \"| OK. Start the program by typing \"mm\"
|\"
@echo
\"+---------------------------------------------------------------------+\"
# # # # Copyright (c) 2008 openSUSE-Build-Service
# # # #
# # # # 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: MountManager
BuildRequires: gcc-c++ libxml2-devel libqt4-devel hal update-desktop-files
Version: 0.2.5
Release: 1
License: GPL v2 or later
Source: mountmanager-0.2.5.tar.gz
Patch1: configure_destination.diff
Patch2: mm_desktop_files.diff
Group: Productivity/Other
Summary: Mount Manager for QT4
Packager: Sascha Manns <Sascha.Manns@xxxxxxxxxxxxx> for openSUSE
Build-Service
Url:
http://www.kde-apps.org/content/show.php?content=76502&forumpage=0
BuildRoot: %{_tmppath}/%{name}-%{version}-build


%description
What MountManager can:
-Points options of mounting for different partitions
-Shows all logical and physical disks
-Descripes options and other settings of mounting
-Restores last configurations of the system
-Mounts images
-Supports plugins
-Creates udev rules
-Mounts NFS and Samba shares

All screenshots you can watch there:
http://picasaweb.google.com/vialinx.org/MountManagerScreenshots

%prep

%setup -q -n mountmanager-%version
%patch1 -p1
%patch2 -p1

%build

# Assume that the package is built by plain 'make' if there's no ./configure.
# This test is there only because the wizard doesn't know much about the
# package, feel free to clean it up
## if test -x ./configure; then
##
## fi
../configure --prefix=/usr --qmake=/usr/bin/qmake --lib_path=/usr/%{_lib}
--destination=%buildroot

make

%install

make install

# remove .desktop files
# find # %buildroot -type f | grep .desktop | xargs rm -f
# and add own
%suse_update_desktop_file -i mountmanager

# Write a proper %%files section and remove these two commands and
# the '-f filelist' option to %%files
echo '%%defattr(-,root,root)' >filelist
find %buildroot -type f -printf '/%%P*\n' >>filelist
find %buildroot/usr/share/doc -type f | xargs chmod -x



%clean
rm -rf %buildroot


%files -f filelist
%defattr(-,root,root)

# This is a place for a proper filelist:
# /usr/bin/MountManager
# You can also use shell wildcards:
# /usr/share/MountManager/*
# This installs documentation files from the top build directory
# into /usr/share/doc/...
%doc readme.en readme.ru doc/
# The advantage of using a real filelist instead of the '-f filelist' trick is
# that rpmbuild will detect if the install section forgets to install
# something that is listed here


%changelog
* Sun Jan 04 2009 Sascha Manns <Sascha.Manns@xxxxxxxxxxxxx>
- Writing Specfile to compatibility Suse 1110
* Wed Nov 05 2008 Sascha.Manns@xxxxxxxxxxxxx
- packaged MountManager version 0.2.5 using the buildservice spec file wizard

< Previous Next >