Hi,
could you please suggest the right process to avoid conflicts between the
local package copy, devel project, and Factory?
I committed the 19 OOo source packages and got many conflicts. It drives me
mad a bit ;-)
See the attached files for more details. Also see description of my workflow
below.
I have got the following types of conflicts:
a) package version conflict in OpenOffice_org-icon-themes.spec:
+ probably caused by three different versions in
all three locations (local copy, devel project, factory)
+ caused two level conflict !!!:
+ one during "osc up" to be able to commit into the devel project
+ second during "osc pull" to resolve conflict with factory and unblock
the build in the devel project
b) package version conflict in OpenOffice_org-extensions.spec:
+ probably caused by different release number in Factory
c) license tag conflict in OpenOffice_org-extensions.spec:
+ the shorter license was either from older spec or from PDB or ?
+ do we still update it by prepare_spec?
d) license tag conflict in OpenOffice_org-libs-core.spec
+ I have no idea where the "LGPLv3" is taken from; IMHO, it is neither from
PDB nor from older spec
+ is it possible that it was wrongly taken from a subpackage?
+ what tool actually put the "LGPLv3" there?
e) header conflict in OpenOffice_org-help-group2.spec:
+ the problem is that I regenerated the spec from
OpenOffice_org-help-groupX.spec.in => it included the
hardcoded group1 while prepare_spec put the right "group2"
there in Factory
+ I might update OpenOffice_org-help-groupX.spec.in and ooo-help-gen-spec
but is it really needed?
f) changelog conflict in OpenOffice_org-icon-themes.changes:
+ same problem as with the first mentioned version conflict; probably caused
by three different versions in all three locations (local
copy, devel project, factory)
+ again it caused two level conflict (up and pull)
I use the following workflow:
1. submit changes into the devel project
2. create submit request into factory when it builds
3. immediately start doing changes locally
4. put a hotfix into the devel project and factory because a critical bug is
found; do it from the same local copy; just temporary remove the
other changes that are not finished yet; merge them back after the
hotfix is committed; this probably caused the conflict "b"
(release number)
5. packages are accepted in Factory in the mean time (the branch id get
broken)
6. run "osc up"; otherwise "osc commit" complains about different branch IDs
7. take some pills to keep me quiet :-)
8. resolve conflicts with the devel project (something pushed back from
factory or so)
9. run "osc commit"
10. take more pills :-)
11. run "osc pull" if BS complain about conflicts with factory
12. resolve conflicts with factory
13. call my psychiatrist if there is a free room in a mad-house; she tells me
that everything is great; this is 13th step and it is my lucky
number ;-)
14. continue with the step 2 and 3
Questions and hints:
+ do I anything wrong?
+ is there a better supported workflow?
+ do we really need to update license, release tags, header in the
factory repo?
+ would be possible to call prepare spec locally before or during "osc
commit"?
+ does anyone understand the 2 level conflicts "a" and "f"?
+ is it possible that the merge functionality is broken?
You know, it sounds a bit crazy if I am the only one doing changes in the OOo
packages and still have to resolve conflicts :-)
Please, do not tell me that I should wait for commit into factory before doing
more changes ;-)
--
Best Regards,
Petr Mladek
software developer
---------------------------------------------------------------------
SUSE LINUX, s. r. o. e-mail: pmladek(a)suse.cz
Lihovarská 1060/12 tel: +420 284 028 952
190 00 Prague 9 fax: +420 284 028 951
Czech Republic http://www.suse.cz/
Hello Mates,
i´m reworking our boinc package.
ATM i´m ge the Warning: shlib-policy-missing-suffix.
Sadly i´ve forgotten, how to fix this. Maybe anyone can help out? (Spec
attached)
cu Sascha
--
Sincerely yours
Sascha Manns
open-slx GmbH
openSUSE Community & Support Agent
openSUSE Marketing Team
Blog: http://saigkill.wordpress.com
Web: http://www.open-slx.de (openSUSE Box Support German)
Web: http://www.open-slx.com (openSUSE Box Support English)
Hi, I'm trying to make kdemultimedia3 build for factory again in
home:plater:kde3 and I've been trying to fix a possible gcc45 build error:-
|./xine_artsplugin/.libs/xinePlayObject_impl.o: In function `xine_shared_init':
/usr/src/packages/BUILD/kdemultimedia-3.5.10/xine_artsplugin/xinePlayObject_impl.cpp:114: undefined reference to `pthread_create'
/usr/src/packages/BUILD/kdemultimedia-3.5.10/xine_artsplugin/xinePlayObject_impl.cpp:116: undefined reference to `pthread_detach'
./xine_artsplugin/.libs/xinePlayObject_impl.o: In function `~xinePlayObject_impl':
/usr/src/packages/BUILD/kdemultimedia-3.5.10/xine_artsplugin/xinePlayObject_impl.cpp:225: undefined reference to `pthread_join'
/usr/src/packages/BUILD/kdemultimedia-3.5.10/xine_artsplugin/xinePlayObject_impl.cpp:225: undefined reference to `pthread_join'
./xine_artsplugin/.libs/xinePlayObject_impl.o: In function `xinePlayObject_impl':
/usr/src/packages/BUILD/kdemultimedia-3.5.10/xine_artsplugin/xinePlayObject_impl.cpp:197: undefined reference to `pthread_create'
/usr/src/packages/BUILD/kdemultimedia-3.5.10/xine_artsplugin/xinePlayObject_impl.cpp:197: undefined reference to `pthread_create'
collect2: ld returned 1 exit status
as a result of the command :-
/bin/sh ./libtool --silent --mode=link --tag=CXX g++ -Wno-long-long
-Wundef -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align
-Wchar-subscripts -Wall -W -Wpointer-arith -DNDEBUG -DNO_DEBUG -O2
-fmessage-length=0 -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector
-funwind-tables -fasynchronous-unwind-tables -g -fno-strict-aliasing
-Wformat-security -Wmissing-format-attribute -Wno-non-virtual-dtor
-fno-exceptions -fno-check-new -fno-common -DQT_CLEAN_NAMESPACE
-DQT_NO_ASCII_CAST -DQT_NO_STL -DQT_NO_COMPAT -DQT_NO_TRANSLATION
-DQT_THREAD_SUPPORT -D_REENTRANT -Wl,-Bsymbolic-functions
-L/opt/kde3/lib64 -L/usr/lib/qt3/lib64 -L/usr/lib64 -Wl,--as-needed
-Wl,--enable-new-dtags -module -no-undefined -pthread -o
./xine_artsplugin/libarts_xine.la -rpath /opt/kde3/lib64
-Wl,--no-undefined -Wl,--allow-shlib-undefined -L/usr/lib64 -lxine -lX11
-lXext -lkmedia2_idl -lsoundserver_idl -lartsflow
./xine_artsplugin/xinePlayObject.lo
./xine_artsplugin/xinePlayObject_impl.lo ./xine_artsplugin/audio_fifo_out.lo
The first failure is in function :
static xine_t *xine_shared_init()
{
pthread_mutex_lock( &xine_mutex );
++xineRefCount;
if (xine_shared == 0)
{
pthread_t thread;
xine_init_routine();
if (pthread_create( &thread, NULL, xine_timeout_routine, NULL ) == 0)
{
pthread_detach( thread );
}
}
else
{
pthread_cond_signal( &xine_cond );
}
pthread_mutex_unlock( &xine_mutex );
return xine_shared;
}
This builds for 11.2 and has me scratching my head, googling it only
brings up the obvious lack of #include <pthread.h> but this is already
in ||xine_artsplugin/xinePlayObject_impl.h. I've also tried building
with 11.2's autoconf with no difference.
There is a "if (pthread_create( &thread, NULL, xine_timeout_routine,
NULL ) == 0)" in videcreator.cpp but this works. The error is about the
last part of the build as I found out by using the -k flag.
If I build with --with-xine=no it succeeds with missing xine functions.
Thanks
Dave P
|
--
To unsubscribe, e-mail: opensuse-packaging+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-packaging+help(a)opensuse.org
Hi, the last blemish on KDE:KDE3 is kdegraphics3 failing due to lack of
imlib (no gtk anymore) in factory. I wish to change it to use imlib2
does anyone know of a web page or something that gives the differences?
Googling doesn't find me anything except imlib2 and downloads of imlib,
there must have been something once upon a time that gives information
on this.
Regards
Dave P
--
To unsubscribe, e-mail: opensuse-packaging+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-packaging+help(a)opensuse.org
Hi, the last blemish on KDE:KDE3 is kdegraphics3 failing due to lack of
imlib (no gtk anymore) in factory. I wish to change it to use imlib2
does anyone know of a web page or something that gives the differences?
Googling doesn't find me anything except imlib2 and downloads of imlib,
there must have been something once upon a time that gives information
on this.
Regards
Dave P
--
To unsubscribe, e-mail: opensuse-packaging+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-packaging+help(a)opensuse.org
Hi,
There seems to be some information missing about the state of Factory. With
Milestone6 (the original deadline - last monday) all packages are version and
feature frozen.
This means: do not push new features / new versions / new packages towards
Factory just because they are there. If you find that 11.3 will seriously
lack something when not updating, then tell me personally or a list about it
and give pros and cons. And let me get the biggest con straight: what we have
in now has 2 months of testing, what we get later gets less testing.
What you do in devel projects, is of course your concern - and pushing things
there to test is of course a valid approach to convince me. Of course we
exceeded the point where "succeeded" marks the end of testing.
Greetings, Stephan
--
To unsubscribe, e-mail: opensuse-packaging+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-packaging+help(a)opensuse.org
Hi,
lirc kernel modules fail to build in Factory due to missing
linux/autoconf.h. Looks like it's packaged as generated/autoconf.h
now. Bug or Feature? In case of the latter do I need to
s/linux/generated/ or will the kernel packages take care of backward
compatibility?
cu
Ludwig
--
(o_ Ludwig Nussel
//\
V_/_ http://www.suse.de/
SUSE LINUX Products GmbH, GF: Markus Rex, HRB 16746 (AG Nuernberg)
--
To unsubscribe, e-mail: opensuse-packaging+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-packaging+help(a)opensuse.org
Hello,
Which line of the spec is triggering the following error as I don’t which
line/section is causing it.
How can it be fixed
Thanks Glenn
.
.
Processing files: bugzilla-3.6-16.1.noarch
error: File not found:
/usr/src/packages/BUILDROOT/bugzilla-3.6-16.1.x86_64/usr/share/bugzilla/etc/apache2
error: File not found:
/usr/src/packages/BUILDROOT/bugzilla-3.6-16.1.x86_64/usr/share/bugzilla/etc/apache2/conf.d
Executing(%doc): /bin/sh -e /var/tmp/rpm-tmp.0PFS4T
+ umask 022
+ cd /usr/src/packages/BUILD
+ cd bugzilla-3.6
+
DOCDIR=/usr/src/packages/BUILDROOT/bugzilla-3.6-16.1.x86_64/usr/share/doc/packages/bugzilla
+ export DOCDIR
+ rm -rf
/usr/src/packages/BUILDROOT/bugzilla-3.6-16.1.x86_64/usr/share/doc/packages/bugzilla
+ /bin/mkdir -p
/usr/src/packages/BUILDROOT/bugzilla-3.6-16.1.x86_64/usr/share/doc/packages/bugzilla
+ cp -pr README README.mdv docs
/usr/src/packages/BUILDROOT/bugzilla-3.6-16.1.x86_64/usr/share/doc/packages/bugzilla
+ exit 0
RPM build errors:
File not found:
/usr/src/packages/BUILDROOT/bugzilla-3.6-16.1.x86_64/usr/share/bugzilla/etc/apache2
File not found:
/usr/src/packages/BUILDROOT/bugzilla-3.6-16.1.x86_64/usr/share/bugzilla/etc/apache2/conf.d
System halted.
spec file ->
https://build.opensuse.org/package/view_file?file=bugzilla3-6.spec&package=…
log file ->
https://build.opensuse.org/package/live_build_log?arch=x86_64&package=bugzi…
--
To unsubscribe, e-mail: opensuse-packaging+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-packaging+help(a)opensuse.org
Hello,
I get this error in the build process
Preparing packages for installation...
bugzilla-contrib-3.6-15.1
bugzilla-3.6-15.1
warning: user apache does not exist - using root
warning: group apache does not exist - using root
... running 01-check-debuginfo
... testing for empty debuginfo packages
... running 02-check-gcc-output
... testing for serious compiler warnings
(using /usr/lib/build/checks-data/check_gcc_output)
(using //.build.log)
... running 03-check-binary-kernel-log
... running 04-check-filelist
... checking filelist
bugzilla-3.6-15.1.noarch.rpm: directories not owned by a package:
- /etc/apache2
- /etc/apache2/conf.d
System halted.
- What is a way to fix it ?
Can the following be used
%files
%defattr(-,root,root)
.
.
%exclude %{_datadir}/%{name}/etc/apache2
%exclude %{_datadir}/%{name}/etc/apache2/conf.d
Spec file ->
https://build.opensuse.org/package/view_file?file=bugzilla3-6.spec&package=…
log file ->
https://build.opensuse.org/package/live_build_log?arch=x86_64&package=bugzi…
Thanks Glenn
--
To unsubscribe, e-mail: opensuse-packaging+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-packaging+help(a)opensuse.org