Hello community, here is the log from the commit of package gpm for openSUSE:Factory checked in at 2013-12-02 17:01:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gpm (Old) and /work/SRC/openSUSE:Factory/.gpm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gpm" Changes: -------- --- /work/SRC/openSUSE:Factory/gpm/gpm.changes 2013-04-22 14:30:27.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gpm.new/gpm.changes 2013-12-02 17:01:59.000000000 +0100 @@ -1,0 +2,12 @@ +Mon Dec 2 11:40:18 UTC 2013 - [email protected] + +- don't buildrequire systemd, we just need the macros + +------------------------------------------------------------------- +Mon Oct 28 13:46:46 UTC 2013 - [email protected] + +- Add systemd support and drop sysvinit support +- Change pid directory for new standard one +- Fix suse-wrong-suse-capitalisation rpmlint warning + +------------------------------------------------------------------- Old: ---- README.SuSE rcgpm New: ---- README.SUSE gpm.service ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gpm.spec ++++++ --- /var/tmp/diff_new_pack.o6J9ec/_old 2013-12-02 17:02:01.000000000 +0100 +++ /var/tmp/diff_new_pack.o6J9ec/_new 2013-12-02 17:02:01.000000000 +0100 @@ -25,9 +25,9 @@ Url: http://linux.schottelius.org/gpm/ Source0: http://www.nico.schottelius.org/software/gpm/archives/gpm-%{version}.tar.lzma -Source2: rcgpm +Source2: gpm.service Source3: sysconfig.mouse-%{name} -Source4: README.SuSE +Source4: README.SUSE Source5: baselibs.conf Source6: inputattach.c Patch0: gpm-DESTDIR.patch @@ -56,9 +56,11 @@ BuildRequires: lzma BuildRequires: makeinfo BuildRequires: ncurses-devel -BuildRoot: %{_tmppath}/%{name}-%{version}-build -PreReq: %install_info_prereq -PreReq: /bin/sed %insserv_prereq %fillup_prereq +BuildRequires: systemd-rpm-macros +Requires(pre): %install_info_prereq +Requires(pre): /bin/sed +Requires(pre): %fillup_prereq +%{?systemd_requires} Provides: select %ifarch ppc64 # bug437293 @@ -106,7 +108,7 @@ # This package failed when testing with -Wl,-as-needed being default. # So we disable it here, if you want to retest, just delete this comment and the line below. #export SUSE_ASNEEDED=0 -./autogen.sh +NOCONFIGURE=1 ./autogen.sh autoreconf -fi CFLAGS="$RPM_OPT_FLAGS -DQUIET_LIBGPM" \ %configure --disable-static \ @@ -131,12 +133,12 @@ # # start script install -m 755 -d $RPM_BUILD_ROOT/var/adm/fillup-templates -install -m 755 -d $RPM_BUILD_ROOT/etc/init.d +install -m 755 -d $RPM_BUILD_ROOT/%{_unitdir} install -m 755 -d $RPM_BUILD_ROOT/usr/sbin install -m 755 inputattach %{buildroot}%{_sbindir} install -m 644 sysconfig.mouse-%{name} $RPM_BUILD_ROOT/var/adm/fillup-templates -install -m 755 rcgpm $RPM_BUILD_ROOT/etc/init.d/gpm -ln -sf ../../etc/init.d/gpm $RPM_BUILD_ROOT/usr/sbin/rcgpm +install -m 755 %{S:2} $RPM_BUILD_ROOT/%{_unitdir}/gpm.service +ln -sf /sbin/service $RPM_BUILD_ROOT/usr/sbin/rcgpm # there were two variables with the same value GPM_PROTOCOL and MOUSETYPE # in SuLi 8.2. The MOUSETYPE variable better conforms with with other # variable names MOUSEDEVICE and XMOUSETYPE name scheme, so get rid of @@ -152,38 +154,38 @@ # Do not package static library rm -fv $RPM_BUILD_ROOT/%{_libdir}/libgpm.a -mkdir -p %{buildroot}%{_localstatedir}/run -touch %{buildroot}%{_localstatedir}/run/gpm.pid +mkdir -p %{buildroot}/run +touch %{buildroot}/run/gpm.pid %preun -%stop_on_removal gpm +%service_del_preun gpm.service %post /sbin/ldconfig -%{fillup_and_insserv gpm} +%{fillup_only gpm} +%service_add_post gpm.service %{fillup_only -an mouse} %install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz %postun /sbin/ldconfig %install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz -%restart_on_update gpm -%{insserv_cleanup} +%service_del_postun gpm.service %files %defattr(-,root,root) -%doc COPYING README README.gpm2 README.SuSE TODO +%doc COPYING README README.gpm2 README.SUSE TODO %doc doc/Announce doc/FAQ doc/README* doc/changelog %{_infodir}/* %{_mandir}/*/* %dir %config /etc/gpm %config /etc/gpm/* -%config /etc/init.d/gpm +%{_unitdir}/gpm.service %{_bindir}/* %{_sbindir}/* %{_libdir}/libgpm.so.* /var/adm/fillup-templates/* -%ghost %{_localstatedir}/run/gpm.pid +%ghost /run/gpm.pid %files devel %defattr(-,root,root) ++++++ README.SUSE ++++++ Dear customer, gpm is using more and more config files in /etc. Therefore we moved all config files into /etc/gpm and removed "gpm-" from config file names. For example: /etc/gpm-root.conf -> /etc/gpm/root.conf /etc/gpm-syn.conf -> /etc/gpm/syn.conf ... Have a lot of fun, Your SuSE team ++++++ gpm.service ++++++ [Unit] Description=Console Mouse manager # This could probably benefit from socket activation, but honestly I think it # is time for gpm to go away, and hence I am not planning to spend the time # to add socket activation here. [Service] EnvironmentFile=-/etc/sysconfig/mouse ExecStart=/usr/sbin/gpm -m /dev/input/mice -t exps2 StandardOutput=syslog Type=forking PIDFile=/run/gpm.pid [Install] WantedBy=multi-user.target -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
