rpms/ushare/devel .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 ushare.spec, 1.17, 1.18

[Eric Tanguy (tanguy)]

Author: tanguy

Update of /cvs/extras/rpms/ushare/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18601

Modified Files:
	.cvsignore sources ushare.spec 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ushare/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	6 Jul 2007 18:02:23 -0000	1.7
+++ .cvsignore	2 Feb 2008 16:24:25 -0000	1.8
@@ -1 +1 @@
-ushare-1.0.tar.bz2
+ushare-1.1a.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ushare/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	6 Jul 2007 18:02:23 -0000	1.7
+++ sources	2 Feb 2008 16:24:25 -0000	1.8
@@ -1 +1 @@
-a6dad95e61ded6f37fc158d9a81358dc  ushare-1.0.tar.bz2
+5bbcdbf1ff85a9710fa3d4e82ccaa251  ushare-1.1a.tar.bz2


Index: ushare.spec
===================================================================
RCS file: /cvs/extras/rpms/ushare/devel/ushare.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ushare.spec	18 Nov 2007 17:25:14 -0000	1.17
+++ ushare.spec	2 Feb 2008 16:24:25 -0000	1.18
@@ -1,8 +1,8 @@
 Summary: UPnP (TM) A/V Media Server
 Name: ushare
-Version: 1.0
-Release: 4%{?dist}
-License: GPL
+Version: 1.1a
+Release: 3%{?dist}
+License: LGPLv2+
 Group: Applications/Multimedia
 URL: http://ushare.geexbox.org/
 
@@ -11,9 +11,10 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: libupnp-devel, pkgconfig
+Requires: /usr/sbin/alternatives
 Requires(pre): fedora-usermgmt
-Requires(post): /sbin/chkconfig
-Requires(preun): /sbin/service, /sbin/chkconfig
+Requires(post): /sbin/chkconfig, /usr/sbin/alternatives
+Requires(preun): /sbin/service, /sbin/chkconfig, /usr/sbin/alternatives
 Requires(postun): /sbin/service
 
 %description
@@ -24,17 +25,21 @@
 
 %prep
 %setup -q
+iconv -f ISO_8859-1 -t UTF-8 AUTHORS --output AUTHORS.utf8
+cp -af AUTHORS.utf8 AUTHORS
 
 %build
-%configure
+export CFLAGS="$RPM_OPT_FLAGS"
+./configure --prefix=%{_prefix} --localedir=%{_datadir}/locale --sysconfdir=%{_sysconfdir} --disable-dlna --enable-debug
 make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
-%makeinstall
+%makeinstall DESTDIR=%{buildroot}
 %{__rm} -rf   %{buildroot}%{_sysconfdir}/init.d
 %{__install} -m 0755 -D %{SOURCE1} %{buildroot}%{_initrddir}/ushare
 %{__mkdir_p} %{buildroot}%{_var}/lib/ushare
+%{__mv} %{buildroot}%{_bindir}/ushare %{buildroot}%{_bindir}/ushare-fedora
 %find_lang %{name}
 
 %clean
@@ -46,28 +51,41 @@
 
 %post
 /sbin/chkconfig --add ushare
+alternatives --install %{_bindir}/ushare ushare %{_bindir}/ushare-fedora 10
 
 %preun
 if [ $1 -eq 0 ]; then
     /sbin/service ushare stop &>/dev/null || :
     /sbin/chkconfig --del ushare
+alternatives --remove ushare %{_bindir}/ushare-fedora
 fi
 
 %postun
 if [ $1 -ge 1 ]; then
-    /sbin/service ushare condrestart &>/dev/null || :
+	/sbin/service ushare condrestart &>/dev/null || :
 fi
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README
-%{_bindir}/ushare
+%{_bindir}/ushare-fedora
 %config(noreplace) %{_sysconfdir}/ushare.conf
 %{_initrddir}/ushare
-%{_mandir}/man1/*
 %attr(770,ushare,ushare) %dir %{_var}/lib/ushare/
 
 %changelog
+* Fri Jan 25 2008 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 1.1a-3
+- Correct some spec error
+
+* Tue Dec 25 2007 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 1.1a-2
+- Introduce use of alternatives
+
+* Thu Dec 06 2007 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 1.1a-1
+- Update to 1.1a
+
+* Wed Dec 05 2007 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 1.1-1
+- Update to 1.1
+
 * Sun Nov 18 2007 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 1.0-4
 - Rebuild for new libupnp.