Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added -common, -xorg and -wayland subpackages #6

Merged
merged 2 commits into from Jul 29, 2013

Conversation

faenil
Copy link
Member

@faenil faenil commented Jul 25, 2013

I have splitted nemo-mobile-session in three subpackages:

  • common: has files needed by both configs (room for future improvement here, as I'm not sure which env vars and which files are X11 only)
  • xorg: keeps x11 session files, pulls in xorg-launch-helper. This is the package current images will automatically upgrade to.
  • wayland: Wayland specific files

It has been tested on an updated X11 image using "zypper dup --from" to bypass the vendor check.

We will have to edit patterns accordingly, pulling in nemo-mobile-session-xorg/wayland instead of nemo-mobile-session

%define _oneshot_groupadd_requires_pre %_oneshot_requires_pre
%define _oneshot_groupadd_requires_post %_oneshot_requires_post, /usr/sbin/groupadd, /usr/bin/groupadd-user
%define _oneshotdir %{_libdir}/oneshot.d

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These should not be needed, if this needs them all packages needs them so this needs to be fixed some other way.

@faenil
Copy link
Member Author

faenil commented Jul 25, 2013

Removed the tar_git fixes, it should not be needed on the official package.

The thing is, if you branch the official package on OBS, without making any modification, it doesn't build, and gives that "unknown tag" error, but with the same files it builds the official package, so it has to have something to do with resolution of tags, maybe my branched package is missing some configuration on OBS (I'm building against nemo:devel:mw)

Anyway, I deleted this commit because it shouldn't be needed for the official package, as it wasn't needed before (I changed nothing related to oneshot)

@saukko I'll wait for your ok and then merge and tag ;)

@saukko
Copy link
Contributor

saukko commented Jul 26, 2013

This will break UI on update if user doesn' install the xorg package as well. We need the nemo-mobile-session-xorg to obsolete nemo-mobile-session <= x where X is the previous version.

@faenil
Copy link
Member Author

faenil commented Jul 26, 2013

Added "Obsoletes: nemo-mobile-session <= 21" in the xorg package

@faenil
Copy link
Member Author

faenil commented Jul 28, 2013

Spent some time studying the packaging system, and I updated the PR, I think it's final now ;)

I will wait for a review before merging :)

@bwachter
Copy link
Contributor

Looks good. Only thing I spotted was the invalid group, but that can probably be ignored at the moment.

rburchell added a commit that referenced this pull request Jul 29, 2013
Added -common, -xorg and -wayland subpackages
@rburchell rburchell merged commit c3923de into nemomobile:master Jul 29, 2013
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants