Browse Source

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@2382 ec354946-7b23-47d6-9f5a-488ba84defc7

kudoh 14 years ago
parent
commit
27eab27eba
2 changed files with 37 additions and 13 deletions
  1. 29 11
      b/backintime/backintime-vl.spec
  2. 8 2
      f/font-manager/font-manager-vl.spec

+ 29 - 11
b/backintime/backintime-vl.spec

@@ -1,18 +1,19 @@
 %bcond_with kde4
 
 Name:            backintime
-Version:         0.9.26
-Release:         10%{?_dist_release}
-Summary:         Simple backup system 
+Version:         1.0.4
+Release:         1%{?_dist_release}
+Summary:         Simple backup system
 Summary(ja):     シンプルなバックアップシステム
 
 Group:           Applications/Archiving
 License:         GPLv2+
 URL:             http://backintime.le-web.org/
 Source0:         http://backintime.le-web.org/download/%{name}/%{name}-%{version}_src.tar.gz
-Source1:         backintime-ja.po
+#Source1:         backintime-ja.po
 
-Patch0:          %{name}-0.9.26_snapshots.patch
+#Patch0:          %{name}-0.9.26_snapshots.patch
+Patch1:          fix_ja.patch
 
 BuildArch:       noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
@@ -40,10 +41,11 @@ Requires:        python
 Requires:        rsync
 Requires:        notify-python
 Requires:        libnotify
+Requires:        crontabs
 
 %description     common
 Back In Time is a simple backup system for Linux inspired from 
-“flyback project” and “TimeVault”. 
+“flyback project” and “TimeVault”.
 This package contains non GUI files used by different GUI fontends.
 
 %description -l ja     common
@@ -65,7 +67,7 @@ Requires:        meld
 %description     gnome
 This package is the GNOME GUI frontend for backintime-common.
 Back In Time is a simple backup system for Linux inspired from 
-“flyback project” and “TimeVault”. 
+“flyback project” and “TimeVault”.
 
 %description -l ja     gnome
 Back In Timeは “flyback project” と “TimeVault” に触発された
@@ -87,7 +89,7 @@ Requires:        kdesdk
 %description     kde
 This is the KDE4 GUI frontend for backintime-common.
 Back In Time is a simple backup system for Linux inspired from 
-“flyback project” and “TimeVault”. 
+“flyback project” and “TimeVault”.
 
 %description -l ja  kde
 Back In Timeは “flyback project” と “TimeVault” に触発された
@@ -97,15 +99,27 @@ Linux のためのシンプルなバックアップシステムです。
 
 %prep
 %setup -q
-%patch0 -p1
+#%patch0 -p1
+%patch1 -p1
 
-%__cp -f %{SOURCE1} common/po/ja.po
+#%__cp -f %{SOURCE1} common/po/ja.po
 
 sed -i 's|Exec=gksu backintime-gnome|Exec=backintime-gnome-root|g' \
        gnome/%{name}-gnome-root.desktop
+sed -i 's|Categories=GNOME;GTK;System;|Categories=GNOME;GTK;System;\nNotShowIn=KDE;|g' \
+       gnome/%{name}-gnome.desktop
 
 %if %{with kde4}
-sed -i 's|Exec=kdesudo -c backintime-kde4|Exec=%{_bindir}/kdesu -c backintime-kde4|g' \
+pushd .
+cd ./kde4
+cp -pr %{name}-kde4.desktop %{name}-kde4-root.desktop
+popd
+
+sed -i 's|Name=Back In Time|Name=Back In Time (root)|g' \
+	kde4/%{name}-kde4-root.desktop
+sed -i 's|Exec=backintime-kde4|Exec=%{_bindir}/kdesu -c backintime-kde4|g' \
+	kde4/%{name}-kde4-root.desktop
+sed -i 's|Categories=Qt;KDE;System;|Categories=Qt;KDE;System;\nNotShowIn=GNOME;XFCE;LXDE;|g' \
 	kde4/%{name}-kde4-root.desktop
 %endif
 
@@ -279,6 +293,10 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Sat Dec 25 2010 Toshiharu Kudoh <toshi.kd2@gmail.com> - 1.0.4-1
+- new upstream release
+- added Patch1 to fix ja.po a little
+
 * Sat Feb 6 2010 Toshiharu Kudoh <toshi.kd2@gmail.com> - 0.9.26-10
 - rebuilt with python-2.6.4
 

+ 8 - 2
f/font-manager/font-manager-vl.spec

@@ -1,9 +1,9 @@
 Name:           font-manager
-Version:        0.5.6
+Version:        0.5.7
 Release:        1%{?_dist_release}
 Summary:        A font management application for the GNOME desktop environment
 Summary(ja):    GNOME デスクトップ環境のフォント管理アプリケーション
-BuildArch:      noarch
+#BuildArch:      noarch
 Group:          Applications/Publishing
 License:        GPLv3+
 URL:            http://code.google.com/p/font-manager
@@ -11,6 +11,7 @@ Source0:        http://font-manager.googlecode.com/files/%{name}-%{version}.tar.
 #Patch0:        font-manager-0.4.3-adjust-python-optimization.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 Requires:       fontconfig libxml2-python pygtk2 pygobject gucharmap file-roller
+Requires:       pycairo yelp sqlite3
 BuildRequires:  python desktop-file-utils
 
 %description
@@ -56,6 +57,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/font-sampler.desktop
 
 %changelog
+* Fri Dec 24 2010 Toshiharu Kudoh <toshi.kd2@gmail.com> - 0.5.7-1
+- new upstream release
+- changed BuildArch to fail building
+- added Requires: pycairo yelp sqlite3
+
 * Tue Aug 10 2010 Toshiharu Kudoh <toshi.kd2@gmail.com> - 0.5.6-1
 - new upstream release