diff options
| -rw-r--r-- | Makefile | 40 | ||||
| -rwxr-xr-x | s2u.sh | 2 | ||||
| -rw-r--r-- | s2u.spec | 99 |
3 files changed, 20 insertions, 121 deletions
@@ -8,11 +8,9 @@ ############################################################################# PACKAGE=s2u -VERSION:=$(shell rpm -q --qf '%{VERSION}\n' --specfile $(PACKAGE).spec | head -1) -RELEASE:=$(shell rpm -q --qf '%{RELEASE}\n' --specfile $(PACKAGE).spec | head -1| sed -e 's/%mkrel \(.*\)/\1mdv/g') TAG := $(shell echo "V$(VERSION)_$(RELEASE)" | tr -- '-.' '__') -FILES = Makefile README hostname-post s2u.c s2u.sh s2u.spec \ +FILES = Makefile README hostname-post s2u.c s2u.sh \ AUTHORS LICENSE README ChangeLog s2u.conf DEFS = -DDBUS_API_SUBJECT_TO_CHANGE=1 @@ -36,7 +34,7 @@ clean: install: install -d $(DESTDIR)/etc/X11/xinit.d - install s2u.sh $(DESTDIR)/etc/X11/xinit.d + install s2u.sh $(DESTDIR)/etc/X11/xinit.d/99s2u install -d $(DESTDIR)/usr/bin install s2u $(DESTDIR)/usr/bin install -d $(DESTDIR)/etc/sysconfig/network-scripts/hostname.d @@ -45,43 +43,43 @@ install: install -m 644 s2u.conf $(DESTDIR)/etc/dbus-1/system.d # rules to build a test rpm +checktag: + @if [ "x$(VERSION)" == "x" -o "x$(RELEASE)" = "x" ]; then \ + echo usage is "make VERSION=version_number RELEASE=release_number dist" ; \ + exit 1 ; \ + fi -localrpm: localdist buildrpm localdist: cleandist dir localcopy tar -cleandist: +cleandist: checktag rm -rf $(PACKAGE)-$(VERSION) $(PACKAGE)-$(VERSION).tar.bz2 -dir: +dir: checktag mkdir $(PACKAGE)-$(VERSION) -localcopy: +localcopy: checktag tar c $(FILES) | tar x -C $(PACKAGE)-$(VERSION) -tar: +tar: checktag tar cvf $(PACKAGE)-$(VERSION).tar $(PACKAGE)-$(VERSION) bzip2 -9vf $(PACKAGE)-$(VERSION).tar rm -rf $(PACKAGE)-$(VERSION) -buildrpm: - rpm -ta $(PACKAGE)-$(VERSION).tar.bz2 - # rules to build a distributable rpm -rpm: changelog cvstag dist buildrpm - -dist: cleandist dir export tar +dist: checktag cleandist svntag export tar -export: - cvs export -d $(PACKAGE)-$(VERSION) -r $(TAG) $(PACKAGE) +export: checktag + svn export $(SVNROOT)/tags/$(TAG) $(PACKAGE)-$(VERSION) -cvstag: - cvs tag $(CVSTAGOPT) $(TAG) +svntag: checktag + svn copy $(SVNROOT)/trunk $(SVNROOT)/tags/$(TAG) -m "$(TAG)" changelog: ../common/username - cvs2cl -U ../common/username -I ChangeLog +#svn2cl is available in our contrib. + svn2cl --authors ../common/username.xml --accum rm -f ChangeLog.bak - cvs commit -m "Generated by cvs2cl the `date '+%d_%b'`" ChangeLog + svn commit -m "Generated by svn2cl the `date '+%c'`" ChangeLog # Makefile ends here @@ -10,6 +10,6 @@ # system bus #--------------------------------------------------------------- -exec s2u --daemon=yes --debug +exec s2u --daemon=yes # s2u.sh ends here diff --git a/s2u.spec b/s2u.spec deleted file mode 100644 index eb14966..0000000 --- a/s2u.spec +++ /dev/null @@ -1,99 +0,0 @@ -Summary: System to user tools -Name: s2u -Version: 0.7 -Release: %mkrel 3 -URL: http://www.mandrivalinux.com/ -Source0: %{name}-%{version}.tar.bz2 -License: GPL -Group: Graphical desktop/Other -BuildRoot: %{_tmppath}/%{name}-buildroot -BuildRequires: dbus-glib-devel -BuildRequires: gtk+2-devel -Requires: dbus -Requires: initscripts >= 7.06-52mdk - -%description -Use dbus to communicate between from the system to the users. - -%prep -%setup -q - -%build -%make CFLAGS="$RPM_OPT_FLAGS" - -%install -rm -rf $RPM_BUILD_ROOT -%makeinstall_std - -%clean -rm -rf $RPM_BUILD_ROOT - -%files -%defattr(-,root,root) -%doc ChangeLog README AUTHORS LICENSE -%_bindir/s2u -%_sysconfdir/X11/xinit.d/s2u.sh -%_sysconfdir/sysconfig/network-scripts/hostname.d/s2u -%config(noreplace) %_sysconfdir/dbus-1/system.d/*.conf - -# MAKE THE CHANGES IN SVN: NO PATCH OR SOURCE ALLOWED - -%changelog -* Fri Aug 04 2006 Frederic Crozat <fcrozat@mandriva.com> 0.7-3mdv2007.0 -- Fix buildrequires - -* Tue Aug 01 2006 Frederic Crozat <fcrozat@mandriva.com> 0.7-2mdv2007.0 -- Rebuild with latest dbus - -* Mon May 29 2006 Frederic Crozat <fcrozat@mandriva.com> 0.7-1mdv2007.0 -- Fix for modular xorg -- Fix crash when parsing cookie fails - -* Fri Jan 27 2006 Frederic Lepied <flepied@mandriva.com> 0.6-1mdk -- switch to Mandriva -- log actions by default -- mkrel - -* Wed Jan 25 2006 Frederic Crozat <fcrozat@mandriva.com> 0.5-5mdk -- Rebuild for latest dbus - -* Fri Oct 28 2005 Frederic Crozat <fcrozat@mandriva.com> 0.5-4mdk -- Rebuild with new dbus - -* Wed Mar 09 2005 Frederic Crozat <fcrozat@mandrakesoft.com> 0.5-3mdk -- add new signal to start update-menus if requested by system -- remove dbus-x11 requires - -* Tue Mar 08 2005 Frederic Crozat <fcrozat@mandrakesoft.com> 0.5-2mdk -- connect to X server, so s2u exits when X exits - -* Mon Mar 07 2005 Frederic Crozat <fcrozat@mandrakesoft.com> 0.5-1mdk -- Release 0.5 : - no longer use session bus, use system bus instead (fix Mdk bug #13166) - -* Mon Oct 18 2004 Gwenole Beauchesne <gbeauchesne@mandrakesoft.com> 0.4-1mdk -- lib64 fixes - -* Wed Aug 25 2004 Frederic Lepied <flepied@mandrakesoft.com> 0.3-1mdk -- don't put noreplace on these scripts -- changes in cvs -- use $DISPLAY in temp filename - -* Wed Aug 25 2004 Götz Waschk <waschk@linux-mandrake.com> 0.2-2mdk -- mark config files -- fix file list -- drop prefix -- fix buildrequires - -* Wed Aug 18 2004 Frederic Lepied <flepied@mandrakesoft.com> 0.2-1mdk -- add a require on dbus -- put temporary file in /tmp instead of /var/tmp and use a naming - which includes the user name - -* Tue Aug 03 2004 Christiaan Welvaart <cjw@daneel.dyndns.org> 0.1-2mdk -- fix buildrequires - -* Sat Jul 31 2004 Frederic Lepied <flepied@mandrakesoft.com> 0.1-1mdk -- monitor hostname change - -# end of file |