rpms/beryl-manager/FC-6 beryl-manager.desktop, NONE, 1.1 beryl-manager.svg, NONE, 1.1 beryl-manager.spec, 1.1, 1.2

Jarod Wilson (jwilson) fedora-extras-commits at redhat.com
Wed Nov 22 19:39:20 UTC 2006


Author: jwilson

Update of /cvs/extras/rpms/beryl-manager/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv856

Modified Files:
	beryl-manager.spec 
Added Files:
	beryl-manager.desktop beryl-manager.svg 
Log Message:
trimmed BR: and added desktop file


--- NEW FILE beryl-manager.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Beryl Manager
Comment=Manage Beryl
Icon=/usr/share/pixmaps/beryl-manager.svg
Exec=beryl-manager
Terminal=false
Type=Application
Categories=Settings;
MimeType=application/x-beryl-manager;



--- NEW FILE beryl-manager.svg ---
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://web.resource.org/cc/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="48" height="48" id="svg2" sodipodi:version="0.32" inkscape:version="0.44" sodipodi:docbase="/home/andrew/Desktop" sodipodi:docname="berly_final.svg" version="1.0" inkscape:export-filename="/home/andrew/Desktop/beryl_final/beryl_icon_final.png" inkscape:export-xdpi="480" inkscape:export-ydpi="480">
  <defs id="defs4">
    <linearGradient id="linearGradient5316">
      <stop style="stop-color: rgb(239, 41, 41); stop-opacity: 0;" offset="0" id="stop5318"/>
      <stop style="stop-color: rgb(164, 0, 0); stop-opacity: 1;" offset="1" id="stop5320"/>
    </linearGradient>
    <linearGradient inkscape:collect="always" id="linearGradient5308">
      <stop style="stop-color: rgb(138, 226, 52); stop-opacity: 1;" offset="0" id="stop5310"/>
      <stop style="stop-color: rgb(138, 226, 52); stop-opacity: 0;" offset="1" id="stop5312"/>
    </linearGradient>
    <linearGradient id="linearGradient5268">
      <stop style="stop-color: rgb(204, 0, 0); stop-opacity: 1;" offset="0" id="stop5270"/>
      <stop style="stop-color: rgb(164, 0, 60); stop-opacity: 0;" offset="1" id="stop5272"/>
    </linearGradient>
    <linearGradient inkscape:collect="always" id="linearGradient5252">
      <stop style="stop-color: rgb(138, 226, 52); stop-opacity: 1;" offset="0" id="stop5254"/>
      <stop style="stop-color: rgb(138, 226, 52); stop-opacity: 0;" offset="1" id="stop5256"/>
    </linearGradient>
    <linearGradient inkscape:collect="always" id="linearGradient5244">
      <stop style="stop-color: rgb(138, 226, 52); stop-opacity: 1;" offset="0" id="stop5246"/>
      <stop style="stop-color: rgb(138, 226, 52); stop-opacity: 0;" offset="1" id="stop5248"/>
    </linearGradient>
    <linearGradient id="linearGradient4743">
      <stop style="stop-color: rgb(78, 154, 6); stop-opacity: 1;" offset="0" id="stop4745"/>
      <stop id="stop4751" offset="0.5" style="stop-color: rgb(115, 210, 22); stop-opacity: 1;"/>
      <stop style="stop-color: rgb(78, 154, 6); stop-opacity: 1;" offset="1" id="stop4747"/>
    </linearGradient>
    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5316" id="linearGradient15044" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.953602, 0.0211153, -0.0211153, 0.953602, 63.9493, -1.59483)" x1="-36.785713" y1="28" x2="-40.535713" y2="46.214287"/>
    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5308" id="linearGradient15047" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.953602, 0.0211153, -0.0211153, 0.953602, 63.9448, -1.87839)" x1="-46.42857" y1="28.357143" x2="-42.67857" y2="46.392857"/>
    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5268" id="linearGradient15050" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.953602, 0.0211153, -0.0211153, 0.953602, 63.9493, -1.59483)" x1="-28.392857" y1="25.5" x2="-37.142857" y2="43.714287"/>
    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5268" id="linearGradient15053" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.953602, 0.0211153, -0.0211153, 0.953602, 63.9493, -1.59483)" x1="-55.892857" y1="25.321428" x2="-45.714287" y2="44.785713"/>
    <radialGradient inkscape:collect="always" xlink:href="#linearGradient5268" id="radialGradient15056" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.953602, 0.0211153, -0.00880252, 0.397533, 55.0517, 0.141148)" cx="-32.547497" cy="20.01099" fx="-32.547497" fy="20.01099" r="12.182409"/>
    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5268" id="linearGradient15059" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.953602, 0.0211153, -0.0211153, 0.953602, 63.9493, -1.59483)" x1="-23.214285" y1="13.535714" x2="-28.928572" y2="9.4285717"/>
    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5268" id="linearGradient15062" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.953602, 0.0211153, -0.0211153, 0.953602, 63.9493, -1.59483)" x1="-61.42857" y1="14.607143" x2="-53.392857" y2="9.0714283"/>
    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5268" id="linearGradient15065" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.953602, 0.0211153, -0.0211153, 0.953602, 63.9493, -1.59483)" x1="-24.107143" y1="22.642857" x2="-31.071428" y2="13.892857"/>
    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5252" id="linearGradient15068" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.953602, 0.0211153, -0.0211153, 0.953602, 63.9448, -1.87839)" x1="-37.142857" y1="27.107143" x2="-36.546818" y2="20.142857"/>
    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5244" id="linearGradient15071" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.953602, 0.0211153, -0.0211153, 0.953602, 63.8732, -1.95327)" x1="-47.013756" y1="28.04245" x2="-47.013756" y2="20.321428"/>
    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5268" id="linearGradient15074" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.953602, 0.0211153, -0.0211153, 0.953602, 63.9493, -1.59483)" x1="-58.035713" y1="23" x2="-50.535713" y2="13.892857"/>
    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4743" id="linearGradient15077" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.16034, 0.0256928, -0.0256928, 1.16034, -3.33514, 0.090572)" x1="12.184965" y1="8.4777822" x2="23.65625" y2="8.2883787"/>
    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5268" id="linearGradient15080" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.997557, 0.0220884, -0.0210785, 0.951947, 1.1525, 0.313109)" x1="23.809519" y1="26.765266" x2="24.701157" y2="-15.75837"/>
  </defs>
  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" gridtolerance="10000" guidetolerance="10" objecttolerance="10" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="11.2" inkscape:cx="27.579395" inkscape:cy="18.506962" inkscape:document-units="px" inkscape:current-layer="layer1" inkscape:window-width="1280" inkscape:window-height="949" inkscape:window-x="1291" inkscape:window-y="55" width="48px" height="48px" showguides="true" inkscape:guide-bbox="true">
    <sodipodi:guide orientation="horizontal" position="28.75" id="guide2648"/>
  </sodipodi:namedview>
  <metadata id="metadata7">
    <rdf:RDF>
      <cc:Work rdf:about="">
        <dc:format>image/svg+xml</dc:format>
        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
      </cc:Work>
    </rdf:RDF>
  </metadata>
  <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1">
    <path style="fill: rgb(164, 0, 0); fill-opacity: 1; stroke: none; stroke-width: 1; stroke-linecap: round; stroke-miterlimit: 4; stroke-opacity: 1;" d="M 16.598434,1.1656986 L 4.7948944,6.8544945 L 2.6229628,14.41115 L 2.5254475,14.504446 L 22.207236,46.759276 L 22.268028,46.887898 L 22.299831,46.888599 L 22.330227,46.952913 L 22.458845,46.892122 L 22.610113,47.24548 L 23.34511,47.102658 L 23.725348,47.174716 L 23.893515,46.764796 L 45.108124,15.542793 L 43.148412,7.7673766 L 31.642161,1.4669854 L 16.598434,1.1656986 z " id="path3816" sodipodi:nodetypes="ccccccccccccccccc"/>
    <path style="fill: url(#linearGradient15080); fill-opacity: 1; stroke: white; stroke-width: 0.974923; stroke-linecap: round; stroke-miterlimit: 4; stroke-dasharray: none; stroke-opacity: 0;" d="M 17.495286,11.323542 L 13.820229,23.28658 L 23.830558,23.399396 L 23.828151,23.50818 L 33.688616,23.83535 L 30.69173,11.724579 L 24.414637,11.76698 L 24.417044,11.658199 L 17.495286,11.323542 z " id="path3818"/>
    <path style="fill: rgb(204, 0, 0); fill-opacity: 1; stroke: url(#linearGradient15077); stroke-width: 0.953836; stroke-linecap: round; stroke-miterlimit: 4; stroke-opacity: 0;" d="M 30.915135,3.2070595 L 17.207832,2.9398239 L 12.763428,7.0497022 L 17.162589,11.536791 L 30.721631,11.945859 L 35.063681,7.5434866 L 30.915135,3.2070595 z M 30.721631,11.945859 L 30.647506,12.016774 L 33.53722,24.052613 L 41.340752,17.332519 L 33.57107,24.162202 L 25.895567,39.845885 L 33.430044,23.977684 L 23.855646,23.838243 L 23.858856,23.693198 L 14.215954,23.370847 L 23.28118,44.866967 L 23.26994,45.374615 L 23.384341,45.123197 L 23.419,45.196523 L 23.42221,45.051478 L 23.574476,44.728348 L 42.524375,16.306657 L 43.041657,15.882768 L 35.239363,7.8013253 L 30.721631,11.945859 z M 16.80736,3.0035128 L 6.3913319,8.1057933 L 4.7850153,13.4757 L 16.80736,3.0035128 z M 31.309985,3.3971946 L 42.89247,14.428331 L 41.489961,8.9555231 L 31.309985,3.3971946 z M 12.687694,7.1931386 L 4.5353359,14.9213!
 06 L 4.9970856,15.366871 L 13.66803,23.540105 L 17.12472,11.60851 L 12.687694,7.1931386 z M 4.9970856,15.366871 L 22.804975,45.074094 L 13.519773,23.681935 L 4.9970856,15.366871 z " id="path3820"/>
    <path style="fill: url(#linearGradient15074); fill-opacity: 1; stroke: white; stroke-width: 0.953836; stroke-linecap: round; stroke-miterlimit: 4; stroke-dasharray: none; stroke-opacity: 0.864407;" d="M 12.627219,7.202412 L 17.039189,11.604571 L 13.598262,23.519384 L 4.4624802,14.913141 L 12.627219,7.202412 z " id="path3822" sodipodi:nodetypes="ccccc"/>
    <path style="fill: url(#linearGradient15071); fill-opacity: 1; stroke: white; stroke-width: 0.953836; stroke-linecap: round; stroke-miterlimit: 4; stroke-dasharray: none; stroke-opacity: 0.864407;" d="M 17.042814,11.244243 L 23.660562,11.567458 L 17.357592,11.314248 L 13.520506,23.209205 L 17.042814,11.244243 z " id="path3824" sodipodi:nodetypes="ccccc"/>
    <path style="fill: url(#linearGradient15068); fill-opacity: 1; stroke: white; stroke-width: 0.953836; stroke-linecap: round; stroke-miterlimit: 4; stroke-dasharray: none; stroke-opacity: 0.864407;" d="M 30.459189,11.724054 L 23.70786,11.641303 L 30.434658,11.786542 L 33.44844,23.833202 L 30.459189,11.724054 z " id="path3826" sodipodi:nodetypes="ccccc"/>
    <path style="fill: url(#linearGradient15065); fill-opacity: 1; stroke: white; stroke-width: 0.953836; stroke-linecap: round; stroke-miterlimit: 4; stroke-dasharray: none; stroke-opacity: 0.864407;" d="M 35.161103,7.8038576 L 30.558609,12.006413 L 33.468773,24.061856 L 42.976541,15.86843 L 35.161103,7.8038576 z " id="path3828" sodipodi:nodetypes="ccccc"/>
    <path style="fill: url(#linearGradient15062); fill-opacity: 1; stroke: white; stroke-width: 0.953836; stroke-linecap: round; stroke-miterlimit: 4; stroke-dasharray: none; stroke-opacity: 0.864407;" d="M 6.3046555,8.0872908 L 17.158702,2.9249911 L 4.6982014,13.494844 L 6.3046555,8.0872908 z " id="path3830" sodipodi:nodetypes="cccc"/>
    <path style="fill: url(#linearGradient15059); fill-opacity: 1; stroke: white; stroke-width: 0.953836; stroke-linecap: round; stroke-miterlimit: 4; stroke-dasharray: none; stroke-opacity: 0.864407;" d="M 41.413251,8.9415489 L 30.801599,3.1573605 L 42.862044,14.501939 L 41.413251,8.9415489 z " id="path3832" sodipodi:nodetypes="cccc"/>
    <path style="fill: url(#radialGradient15056); fill-opacity: 1; stroke: white; stroke-width: 0.953836; stroke-linecap: round; stroke-miterlimit: 4; stroke-dasharray: none; stroke-opacity: 0.864407;" d="M 17.136269,2.9205755 L 30.826706,3.1954219 L 34.980746,7.5531627 L 30.627999,11.927521 L 17.07035,11.528748 L 12.70022,7.0503037 L 17.136269,2.9205755 z " id="path3834" sodipodi:nodetypes="ccccccc"/>
    <path style="fill: url(#linearGradient15053); fill-opacity: 1; stroke: white; stroke-width: 0.953836; stroke-linecap: round; stroke-miterlimit: 4; stroke-dasharray: none; stroke-opacity: 0.864407;" d="M 13.429872,23.677639 L 22.727098,45.063548 L 4.8570132,15.307806 L 13.429872,23.677639 z " id="path3836" sodipodi:nodetypes="cccc"/>
    <path style="fill: url(#linearGradient15050); fill-opacity: 1; stroke: white; stroke-width: 0.953836; stroke-linecap: round; stroke-miterlimit: 4; stroke-dasharray: none; stroke-opacity: 0.864407;" d="M 33.478026,24.147177 L 23.243315,45.100601 L 42.497162,16.209468 L 33.478026,24.147177 z " id="path3838" sodipodi:nodetypes="cccc"/>
    <path style="fill: url(#linearGradient15047); fill-opacity: 1; stroke: white; stroke-width: 0.953836; stroke-linecap: round; stroke-miterlimit: 4; stroke-dasharray: none; stroke-opacity: 0.864407;" d="M 13.827571,23.481014 L 23.022577,45.119715 L 13.825439,23.293136 L 13.827571,23.481014 z " id="path3840" sodipodi:nodetypes="cccc"/>
    <path style="fill: url(#linearGradient15044); fill-opacity: 1; stroke: white; stroke-width: 0.953836; stroke-linecap: round; stroke-miterlimit: 4; stroke-dasharray: none; stroke-opacity: 0.864407;" d="M 13.782211,23.370912 L 23.179936,45.64859 L 33.340666,23.957471 L 13.782211,23.370912 z " id="path3842" sodipodi:nodetypes="cccc"/>
  </g>
</svg>

Index: beryl-manager.spec
===================================================================
RCS file: /cvs/extras/rpms/beryl-manager/FC-6/beryl-manager.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- beryl-manager.spec	15 Nov 2006 21:11:15 -0000	1.1
+++ beryl-manager.spec	22 Nov 2006 19:38:49 -0000	1.2
@@ -3,11 +3,13 @@
 License:        GPL
 Group:          User Interface/Desktops
 Version:        0.1.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Summary:        Beryl window decorator and theme management utility
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source0:        http://releases.beryl-project.org/%{version}/%{name}-%{version}.tar.bz2
+Source1:        beryl-manager.svg
+Source2:        beryl-manager.desktop
 Patch0:         beryl-manager-0.1.1-pidof.patch
 
 # libdrm is not available on these arches
@@ -16,8 +18,7 @@
 Requires:       beryl-core >= %{version}
 
 BuildRequires:  beryl-core-devel >= %{version}, gtk2-devel >= 2.8.0
-BuildRequires:  libtool, gettext-devel
-BuildRequires:  dbus-glib, dbus-devel, intltool, perl-XML-Parser
+BuildRequires:  perl-XML-Parser, gettext-devel
 
 
 %description
@@ -36,9 +37,6 @@
 %setup -q
 # Use absolute path to pidof, not in most users' $PATH
 %patch0 -p1 -b .pidof
-#autoreconf -v --install
-#glib-gettextize --copy --force
-#intltoolize --automake --copy --force
 
 
 %build
@@ -49,6 +47,10 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
+install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/pixmaps/
+desktop-file-install --vendor fedora \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+  --add-category X-Fedora %{SOURCE2}
 %find_lang %{name}
 
 
@@ -56,15 +58,31 @@
 rm -rf $RPM_BUILD_ROOT
 
 
+%post
+update-mime-database %{_datadir}/mime &> /dev/null || :
+update-desktop-database %{_datadir}/applications &> /dev/null || :
+
+
+%postun
+update-mime-database %{_datadir}/mime &> /dev/null || :
+update-desktop-database %{_datadir}/applications &> /dev/null || :
+
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc COPYING
 %{_bindir}/beryl-manager
 %{_datadir}/pixmaps/*.png
+%{_datadir}/pixmaps/*.svg
+%{_datadir}/applications/*.desktop
 %{_mandir}/man1/beryl-manager.1.gz
 
 
 %changelog
+* Wed Nov 22 2006 Jarod Wilson <jwilson at redhat.com> 0.1.2-3
+- Add desktop file
+- Trim BR:
+
 * Tue Nov 14 2006 Jarod Wilson <jwilson at redhat.com> 0.1.2-2
 - Use upstream tarball, now that there is one
 




More information about the scm-commits mailing list