rpms/dvdisaster/FC-4 dvdisaster.spec, 1.6, 1.7 sources, 1.3, 1.4 dvdisaster.desktop, 1.1, NONE
Dmitry Butskoy (buc)
fedora-extras-commits at redhat.com
Thu Mar 30 12:05:10 UTC 2006
- Previous message (by thread): rpms/dvdisaster/FC-5 dvdisaster.spec, 1.7, 1.8 sources, 1.3, 1.4 dvdisaster.desktop, 1.1, NONE
- Next message (by thread): rpms/dvdisaster/FC-3 dvdisaster.spec, 1.6, 1.7 sources, 1.3, 1.4 dvdisaster.desktop, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: buc
Update of /cvs/extras/rpms/dvdisaster/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1390
Modified Files:
dvdisaster.spec sources
Removed Files:
dvdisaster.desktop
Log Message:
Index: dvdisaster.spec
===================================================================
RCS file: /cvs/extras/rpms/dvdisaster/FC-4/dvdisaster.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- dvdisaster.spec 31 Jan 2006 14:18:05 -0000 1.6
+++ dvdisaster.spec 30 Mar 2006 12:05:09 -0000 1.7
@@ -1,12 +1,11 @@
Name: dvdisaster
-Summary: CD/DVD media data loss/scratch/aging protection
-Version: 0.65
+Summary: Additional error protection for CD/DVD media
+Version: 0.66
Release: 1%{?dist}
Group: Applications/Archiving
License: GPL
URL: http://www.dvdisaster.com
Source0: http://download.berlios.de/dvdisaster/dvdisaster-%{version}.tar.bz2
-Source1: dvdisaster.desktop
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -34,10 +33,10 @@
se il supporto dovesse danneggiarsi col tempo.
%description -l cs
-%{name} poskytuje dodateÄné zabezpeÄenà proti ztrátÄ dat
-na CD a DVD médiÃch způsobené stárnutÃm nebo poÅ¡krábánÃm.
-VytváÅà data oprav chyb, která jsou použita k obnovÄ neÄitelných
-sektorů, pokud se disk pozdÄji poÅ¡kodÃ.
+%{name} poskytuje dodateÄnou ochranu proti ztrátÄ dat na médiÃch CD a DVD
+způsobených poÅ¡krábánÃm nebo stárnutÃm. VytváÅà data oprav chyb, která
+jsou použita pro obnovu neÄitelných sektorů, pokud se disk pozdÄji
+poÅ¡kodÃ.
%prep
@@ -46,41 +45,35 @@
%build
-%configure
+%configure \
+ --docdir=%{_docdir} \
+ --docsubdir=%{name}-%{version} \
+ --localedir=%{_datadir}/locale \
+ --with-nls=yes
+
#make show
-make %{?_smp_mflags} \
- PREFIX=%{_prefix} \
- BINDIR=%{_bindir} \
- MANDIR=%{_mandir} \
- LOCALEDIR=%{_prefix}/share/locale \
- DOCDIR=%{_docdir} \
- DOCSUBDIR=%{_docdir}/%{name}-%{version}
+make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
-make install \
+make install \
BINDIR=$RPM_BUILD_ROOT%{_bindir} \
DOCSUBDIR=$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} \
MANDIR=$RPM_BUILD_ROOT%{_mandir} \
LOCALEDIR=$RPM_BUILD_ROOT%{_prefix}/share/locale
-for man in `find $RPM_BUILD_ROOT%{_mandir} -type f -print`
-do
- sed -i "s:%{_docdir}/dvdisaster-doc:%{_docdir}/%{name}-%{version}:g" $man
-done
+rm -f $RPM_BUILD_ROOT%{_bindir}/*-uninstall.sh
install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps
-install -p -m644 icons/create.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png
-
-sed 's/@NAME@/%{name}/g' %{SOURCE1} >%{name}.desktop
+install -p -m644 contrib/dvdisaster48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png
desktop-file-install --vendor fedora \
--dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
--add-category X-Fedora \
- %{name}.desktop
+ contrib/%{name}.desktop
%find_lang %{name}
@@ -113,6 +106,12 @@
%changelog
+* Thu Mar 30 2006 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.66-1
+- upgrade to 0.66
+- spec file changes/cleanups, merged from a skeleton now included upstream
+- still specify dirs explicitly on install due to typo in GNUmakefile
+- remove unneeded uninstall.sh script after install
+
* Tue Jan 31 2006 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.65-1
- upgrade to 0.65
- drop browser patch (no more needed)
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dvdisaster/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 31 Jan 2006 14:05:15 -0000 1.3
+++ sources 30 Mar 2006 12:05:09 -0000 1.4
@@ -1 +1 @@
-bcab797d77656ca6c672cb646b9c7971 dvdisaster-0.65.tar.bz2
+0bae5ab6bad8c4613d1250609ed1fbab dvdisaster-0.66.tar.bz2
--- dvdisaster.desktop DELETED ---
- Previous message (by thread): rpms/dvdisaster/FC-5 dvdisaster.spec, 1.7, 1.8 sources, 1.3, 1.4 dvdisaster.desktop, 1.1, NONE
- Next message (by thread): rpms/dvdisaster/FC-3 dvdisaster.spec, 1.6, 1.7 sources, 1.3, 1.4 dvdisaster.desktop, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list