WIP: pm custom rpm for prefs

2 files changed, 34 insertions, 32 deletions

diff --git a/palemoon/palemoon-stackrpms.spec b/palemoon/palemoon-stackrpms.spec
index 2493c1b..09326da 100644
--- a/palemoon/palemoon-stackrpms.spec
+++ b/palemoon/palemoon-stackrpms.spec
@@ -1,6 +1,6 @@
 %global tarballdir UXP-PM%{version}_Release
 %global dummy_package   0
-%global pkgname palemoon
+%global appname palemoon
 %global prettyname Pale Moon Web Browser
 %global stackrpms_custom 1
 
@@ -29,7 +29,8 @@
 
 %if 0%{stackrpms_custom}
 Name:		palemoon-stackrpms
-Summary:	Pale Moon web browser with stackrpm customization
+Summary:	Pale Moon web browser with stackrpms prefs
+%global prettyname Pale Moon with stackrpms prefs
 %else
 Name:    palemoon
 Summary:	Pale Moon web browser
@@ -141,18 +142,18 @@ EOF
 %endif
 
 # cleanup
-%{__rm} -rf  %{buildroot}%{_datadir}/idl/%{pkgname} \
-   %{buildroot}%{_includedir}/%{pkgname} \
-   %{buildroot}%{_libdir}/%{pkgname}-devel
+%{__rm} -rf  %{buildroot}%{_datadir}/idl/%{appname} \
+   %{buildroot}%{_includedir}/%{appname} \
+   %{buildroot}%{_libdir}/%{appname}-devel
 
 # desktop files
 %{__mkdir_p} %{buildroot}%{_datadir}/applications
 desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE2}
 
 %{__sed} -i -r -e "s/@NAME@/%{prettyname}/;" \
-   -e "s/@EXEC@/%{pkgname}/;" \
-   -e "s/@ICON@/%{pkgname}/;" \
-   %{buildroot}%{_datadir}/applications/%{pkgname}.desktop
+   -e "s/@EXEC@/%{appname}/;" \
+   -e "s/@ICON@/%{appname}/;" \
+   %{buildroot}%{_datadir}/applications/%{appname}.desktop
 
 # application start script
 # none
@@ -162,25 +163,25 @@ desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE2}
 
 # mimetypes
 %{__install} -Dm0644 %{SOURCE3} \
-   %{buildroot}%{_datadir}/mime/packages/%{pkgname}.xml
+   %{buildroot}%{_datadir}/mime/packages/%{name}.xml
 
 # icons
 %{__mkdir_p} %{buildroot}%{_datadir}/icons/hicolor/symbolic/apps
 for s in 16 22 24 32 48 256 ;
 do
    %{__mkdir_p} %{buildroot}%{_datadir}/icons/hicolor/${s}x${s}/apps
-   %{__cp} -p application/%{pkgname}/branding/official/default${s}.png \
-   %{buildroot}%{_datadir}/icons/hicolor/${s}x${s}/apps/%{pkgname}.png
+   %{__cp} -p application/%{appname}/branding/official/default${s}.png \
+   %{buildroot}%{_datadir}/icons/hicolor/${s}x${s}/apps/%{appname}.png
 done
 
 # Register as an application to be visible in the software center
 # EXPERIMENTAL
 mkdir -p %{buildroot}%{_datadir}/appdata
-cat > %{buildroot}%{_datadir}/appdata/%{pkgname}.appdata.xml <<EOF
+cat > %{buildroot}%{_datadir}/appdata/%{appname}.appdata.xml <<EOF
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Adapted from content by Richard Hughes <richard-at-hughsie-dot-com> -->
 <application>
-  <id type="desktop">%{pkgname}.desktop</id>
+  <id type="desktop">%{appname}.desktop</id>
   <metadata_license>CC0-1.0</metadata_license>
   <description>
     <p>
@@ -225,12 +226,12 @@ filelist() {
 }
 
 %if 0%{stackrpms_custom}
-%{__install} -d %{buildroot}%{_libdir}/%{pkgname}/browser/defaults/preferences/
+%{__install} -d %{buildroot}%{_libdir}/%{name}/browser/defaults/preferences/
 %{__install} -Dm0644 %{SOURCE4} \
-   %{buildroot}%{_libdir}/%{pkgname}/browser/defaults/preferences/
+   %{buildroot}%{_libdir}/%{name}/browser/defaults/preferences/
 %endif
 
-filelist file.lst %{pkgname} usr langpack
+filelist file.lst %{appname} usr langpack
 
 %clean
 %{__rm} -rf %{buildroot} || :
diff --git a/palemoon/palemoon.spec b/palemoon/palemoon.spec
index 52040d1..fea1009 100644
--- a/palemoon/palemoon.spec
+++ b/palemoon/palemoon.spec
@@ -1,6 +1,6 @@
 %global tarballdir UXP-PM%{version}_Release
 %global dummy_package   0
-%global pkgname palemoon
+%global appname palemoon
 %global prettyname Pale Moon Web Browser
 %global stackrpms_custom 0
 
@@ -29,7 +29,8 @@
 
 %if 0%{stackrpms_custom}
 Name:		palemoon-stackrpms
-Summary:	Pale Moon web browser with stackrpm customization
+Summary:	Pale Moon web browser with stackrpms prefs
+%global prettyname Pale Moon with stackrpms prefs
 %else
 Name:    palemoon
 Summary:	Pale Moon web browser
@@ -141,18 +142,18 @@ EOF
 %endif
 
 # cleanup
-%{__rm} -rf  %{buildroot}%{_datadir}/idl/%{pkgname} \
-   %{buildroot}%{_includedir}/%{pkgname} \
-   %{buildroot}%{_libdir}/%{pkgname}-devel
+%{__rm} -rf  %{buildroot}%{_datadir}/idl/%{appname} \
+   %{buildroot}%{_includedir}/%{appname} \
+   %{buildroot}%{_libdir}/%{appname}-devel
 
 # desktop files
 %{__mkdir_p} %{buildroot}%{_datadir}/applications
 desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE2}
 
 %{__sed} -i -r -e "s/@NAME@/%{prettyname}/;" \
-   -e "s/@EXEC@/%{pkgname}/;" \
-   -e "s/@ICON@/%{pkgname}/;" \
-   %{buildroot}%{_datadir}/applications/%{pkgname}.desktop
+   -e "s/@EXEC@/%{appname}/;" \
+   -e "s/@ICON@/%{appname}/;" \
+   %{buildroot}%{_datadir}/applications/%{appname}.desktop
 
 # application start script
 # none
@@ -162,25 +163,25 @@ desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE2}
 
 # mimetypes
 %{__install} -Dm0644 %{SOURCE3} \
-   %{buildroot}%{_datadir}/mime/packages/%{pkgname}.xml
+   %{buildroot}%{_datadir}/mime/packages/%{name}.xml
 
 # icons
 %{__mkdir_p} %{buildroot}%{_datadir}/icons/hicolor/symbolic/apps
 for s in 16 22 24 32 48 256 ;
 do
    %{__mkdir_p} %{buildroot}%{_datadir}/icons/hicolor/${s}x${s}/apps
-   %{__cp} -p application/%{pkgname}/branding/official/default${s}.png \
-   %{buildroot}%{_datadir}/icons/hicolor/${s}x${s}/apps/%{pkgname}.png
+   %{__cp} -p application/%{appname}/branding/official/default${s}.png \
+   %{buildroot}%{_datadir}/icons/hicolor/${s}x${s}/apps/%{appname}.png
 done
 
 # Register as an application to be visible in the software center
 # EXPERIMENTAL
 mkdir -p %{buildroot}%{_datadir}/appdata
-cat > %{buildroot}%{_datadir}/appdata/%{pkgname}.appdata.xml <<EOF
+cat > %{buildroot}%{_datadir}/appdata/%{appname}.appdata.xml <<EOF
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Adapted from content by Richard Hughes <richard-at-hughsie-dot-com> -->
 <application>
-  <id type="desktop">%{pkgname}.desktop</id>
+  <id type="desktop">%{appname}.desktop</id>
   <metadata_license>CC0-1.0</metadata_license>
   <description>
     <p>
@@ -225,12 +226,12 @@ filelist() {
 }
 
 %if 0%{stackrpms_custom}
-%{__install} -d %{buildroot}%{_libdir}/%{pkgname}/browser/defaults/preferences/
+%{__install} -d %{buildroot}%{_libdir}/%{name}/browser/defaults/preferences/
 %{__install} -Dm0644 %{SOURCE4} \
-   %{buildroot}%{_libdir}/%{pkgname}/browser/defaults/preferences/
+   %{buildroot}%{_libdir}/%{name}/browser/defaults/preferences/
 %endif
 
-filelist file.lst %{pkgname} usr langpack
+filelist file.lst %{appname} usr langpack
 
 %clean
 %{__rm} -rf %{buildroot} || :