On Fri, Nov 30, 2012 at 05:47:23PM +0100, Frank Schütte wrote:
> Hallo,
>
> >
>
> > in a past I've accepted few of your changes, which enables the build of
>
> > some java packages for other distros. But as I thought, this is not
>
> > really compatible with our Factory process and for a long term I am
>
> > pretty sure I don't want to maintain spec files with a crufty %if %else
>
> > sections.
>
> >
>
> I understand that this conditionals are not compatible with a development
>
> project. My goal is to maintain a single package for the education project.
>
> I thought it be a good idea not to package each and every lib I use with
>
> my package but use the existing packages instead.
>
>
>
> As the education project builds for many different (and sometimes old)
>
> repos I came to realize that I have to make sure the packages my package
>
> requires are buildable in each of this repos.
>
>
>
> >
>
> > As you seems to be interested on it, I will gladly add you as a
>
> > maintainer of a new project. Your first task, if you will accept this
>
> > challenge, will be a pick a new name for the project. Alternativelly we
>
> > might stay with Java:packages name - I am sure I saw that in some
>
> > recommended third party repo lists.
>
> I guess I would not be able to maintain a whole project of my own but
>
> thank you very much for this offer.
>
> It seems to me it would be a viable solution if I copied the needed packages
>
> to my home project and maintain it there separate from your Java:packages
>
> project.
>
> How do I do this? I understand if I branch a package it interferes with your
>
> development. Do I have to check out the sources and create a new package
>
> in my home project with the sources or is there a smarter way?
Hallo Frank,
the best way is to create a branch from Java:packages
osc branch Java:packages foo home:$login:java
in case the package in Java:packages will be changed, then you can merge
it by
osc pull - this will pull the latest changes from J:p
osc status will tell you which packages are in 'C' onflict state -
mostly spec file and changes.
Then just open a text editor and file the <<<<< ====== >>>> in the file
and merge things manually. Afterwards, just commit the merged version
back.
It will look like that
<<<<< spec.mine
Version: 1.0
Release: 3
========
Version: 1.1
Release: 0
>>>> spec.r6584
Normally there are not that many changes in J:p, so it would not needs
to be done too often.
Thanks for understanding
Michal Vyskocil
