[packaging] added -common, -xorg, -wayland subpackages

faenil · Jul 28, 2013 · 6fa549e · 6fa549e
1 parent 13161bb
commit 6fa549e
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 46 deletions.
diff --git a/rpm/nemo-configs-x86.spec b/rpm/nemo-configs-x86.spec
@@ -21,13 +21,35 @@ Source100:  nemo-configs-x86.yaml
 %{summary}.
 
 
-%package vm
-Summary:    Configs for x86 vm adaptation
+%package vm-common
+Summary:    Common files shared by both Xorg and Wayland for x86 vm adaptation
 Group:      Configs
+
+%description vm-common
+%{summary}.
+
+
+%package vm-xorg
+Summary:    Xorg Configs for x86 vm adaptation
+Group:      Configs
+Requires:   nemo-configs-x86-vm-common
+Provides:   nemo-configs-x86-vm > 0.2.1
 Provides:   nemo-mobile-configs-x86-vm > 2
+Conflicts:  nemo-configs-x86-vm-wayland
+Obsoletes:  nemo-configs-x86-vm <= 0.2.1
 Obsoletes:  nemo-mobile-configs-x86-vm <= 2
 
-%description vm
+%description vm-xorg
+%{summary}.
+
+
+%package vm-wayland
+Summary:    Wayland Configs for x86 vm adaptation
+Group:      Configs
+Requires:   nemo-configs-x86-vm-common
+Conflicts:  nemo-configs-x86-vm-xorg
+
+%description vm-wayland
 %{summary}.
 
 
@@ -66,12 +88,22 @@ rm -rf %{buildroot}
 # << install post
 
 
-%files vm
+%files vm-common
 %defattr(-,root,root,-)
 %{_sharedstatedir}/environment/nemo/61-x86-vm.conf
+# >> files vm-common
+# << files vm-common
+
+%files vm-xorg
+%defattr(-,root,root,-)
+# >> files vm-xorg
+# << files vm-xorg
+
+%files vm-wayland
+%defattr(-,root,root,-)
 %{_sharedstatedir}/environment/compositor/61-x86-vm-ui.conf
-# >> files vm
-# << files vm
+# >> files vm-wayland
+# << files vm-wayland
 
 %files generic
 %defattr(-,root,root,-)

diff --git a/rpm/nemo-configs-x86.yaml b/rpm/nemo-configs-x86.yaml
@@ -1,40 +1 @@
-Name: nemo-configs-x86
-Summary: Some configs for x86-generic adaptation in Nemo Mobile
-Description: |
-  %{summary}.
-Version: 0.1
-Release: 1
-Group: Configs
-License: GPLv2
-Sources:
-    - "%{name}-%{version}.tar.bz2"
-Configure: none
-Builder: none
-NoFiles: True
-BuildArch: noarch
-
-SubPackages:
-   - Name: vm
-     Group: Configs
-     Summary: Configs for x86 vm adaptation
-     Description: |
-      %{summary}.
-     Obsoletes:
-      - nemo-mobile-configs-x86-vm <= 2
-     Provides:
-      - nemo-mobile-configs-x86-vm > 2
-     Files:
-      - "%{_sharedstatedir}/environment/nemo/61-x86-vm.conf"
-      - "%{_sharedstatedir}/environment/compositor/61-x86-vm-ui.conf"
-
-   - Name: generic
-     Group: Configs
-     Summary: Configs for generic x86 adaptation
-     Description: |
-      %{summary}.
-     Obsoletes:
-      - nemo-mobile-configs-x86-generic <= 2
-     Provides:
-      - nemo-mobile-configs-x86-generic > 2
-     Files:
-      - "%{_sharedstatedir}/environment/nemo/61-x86-generic.conf"
+Name: nemo-configs-x86Summary: Some configs for x86-generic adaptation in Nemo MobileDescription: |  %{summary}.Version: 0.1Release: 1Group: ConfigsLicense: GPLv2Sources:    - "%{name}-%{version}.tar.bz2"Configure: noneBuilder: noneNoFiles: TrueBuildArch: noarchSubPackages:   - Name: vm-common     Group: Configs     Summary: Common files shared by both Xorg and Wayland for x86 vm adaptation     Description: |      %{summary}.     Files:      - "%{_sharedstatedir}/environment/nemo/61-x86-vm.conf"   - Name: vm-xorg     Group: Configs     Summary: Xorg Configs for x86 vm adaptation     Description: |      %{summary}.     Requires:         - nemo-configs-x86-vm-common     Provides:      # make images using old packages names (i.e. x11 images) upgrade to -xorg package      - nemo-configs-x86-vm > 0.2.1      - nemo-mobile-configs-x86-vm > 2     Obsoletes:       - nemo-configs-x86-vm <= 0.2.1      - nemo-mobile-configs-x86-vm <= 2     Conflicts:      - nemo-configs-x86-vm-wayland     Files:      # Currently empty package, it's more consistent to have -xorg package as well, even if currently empty      - ""   - Name: vm-wayland     Group: Configs     Summary: Wayland Configs for x86 vm adaptation     Description: |      %{summary}.     Requires:      - nemo-configs-x86-vm-common     Conflicts:      - nemo-configs-x86-vm-xorg     Files:      - "%{_sharedstatedir}/environment/compositor/61-x86-vm-ui.conf"   - Name: generic     Group: Configs     Summary: Configs for generic x86 adaptation     Description: |      %{summary}.     Obsoletes:      - nemo-mobile-configs-x86-generic <= 2     Provides:      - nemo-mobile-configs-x86-generic > 2     Files:      - "%{_sharedstatedir}/environment/nemo/61-x86-generic.conf"